diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2009-05-01 20:22:54 +0100 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-05-01 20:22:54 +0100 |
| commit | c9c54dff2274b232ffb294eb112a707bdb08979c (patch) | |
| tree | 491591b1eaf400935befe1a8892e8ffdd6c6157d | |
| parent | 7c5721fde04a54c72d55c202440d07241b554d87 (diff) | |
| parent | aed989bee84635625b1af33907fe082df6de163f (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.net/openembedded into org.openembedded.dev
143 files changed, 212 insertions, 13410 deletions
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index 8c8de40f9d..992235a4b9 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -71,9 +71,3 @@ PREFERRED_VERSION_libusb ?= "0.0.0" # boost 1.36 won't build PREFERRED_VERSION_boost ?= "1.33.1" - -# We don't really care which openssl and openssl-native we get, but -# the DEFAULT_PREFERENCE set in the recipes is such that if we don't -# specify explicitly, we may get mismatched versions. -PREFERRED_VERSION_openssl ?= "0.9.8j" -PREFERRED_VERSION_openssl-native ?= "0.9.8j" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index b141548ce3..51ca9f34b1 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -81,7 +81,7 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME} # to enable/disable debugging in the distro. Here noirqdebug is used to # remove the messages about unhandled interrupts - people debugging interrupt # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) -CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc" +CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc" CMDLINE_DEBUG = "noirqdebug" # EXTRA PACKAGES diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf deleted file mode 100644 index 5cb162524f..0000000000 --- a/conf/distro/unslung.conf +++ /dev/null @@ -1,88 +0,0 @@ -#@TYPE: Distribution -#@NAME: Unslung -#@DESCRIPTION: Unslung Linux Distribution for the NSLU2 - -DISTRO_NAME = "Unslung" -DISTRO_VERSION = "6.11-beta" -DISTRO_TYPE = "beta" - -FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" -FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable" -FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable" - -TARGET_FPU = "soft" -TARGET_OS = "linux" - -# select distro specific options to match that of the original LinkSys build -ARM_INSTRUCTION_SET = "arm" -THUMB_INTERWORK = "no" - -# for compatibility PACKAGE_ARCH stays as TARGET_ARCH and TARGET_ARCH is hard-wired -# to armeb - this makes this stuff independent of changes in machine/nslu2.conf -TARGET_ARCH = "armeb" -PACKAGE_ARCH = "${TARGET_ARCH}" -# PACKAGE_EXTRA_ARCHS has the full list of supported architectures (from nslu2be.conf). -# We need "nslu2" added for backwards compatibility. -PACKAGE_EXTRA_ARCHS += "nslu2" - -# match the optimisation settings to that which has traditionally been used -# in unslung -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" - -INHERIT += " package_ipk" - -IMAGE_FSTYPES = "jffs2" -UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}" -EXTRA_IMAGECMD_jffs2 = "-n --pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEVICE_TABLE}" - -UNSLUNG_EXTRA_DEPENDS ?= "" -UNSLUNG_EXTRA_RDEPENDS ?= "" - -UNSLUNG_EXTRA_INSTALL ?= "${UNSLUNG_EXTRA_RDEPENDS}" - -# Select between multiple alternative providers, if more than one is eligible. -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-initial:glibc-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross" -PREFERRED_PROVIDERS += " virtual/libc:glibc" -PREFERRED_PROVIDERS += " linux-libc-headers:linux-libc-headers" - -PREFERRED_PROVIDER_libc6-unslung = "glibc" - -PREFERRED_VERSION_binutils ?= "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" -PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" -PREFERRED_VERSION_gcc-cross-intermediate ?= "3.4.4" -PREFERRED_VERSION_gcc-cross ?= "3.4.4" -PREFERRED_VERSION_gcc ?= "3.4.4" -PREFERRED_VERSION_glibc ?= "2.2.5" -PREFERRED_VERSION_glibc-initial ?= "2.2.5" - -# Whilst gcc 3.4.4 sypports sysroot, binutils 2.15.94.0.1 does not -# so we need the linkage helpers to help binutils find staging. -DEPENDS_append_pn-linux-libc-headers = "cross-linkage staging-linkage" - -PREFERRED_PROVIDER_virtual/kernel = "unslung-kernel" -PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63" -PREFERRED_VERSION_unslung-rootfs ?= "2.3r63" -PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" -PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r63" -PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r63" - -CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" -INHERIT += "nslu2-mirrors" - -#------------------------------------------------------------------- -# FIXME! -# This is clearly wrong, the headers should match the 2.4.22 kernel, -# but locking this to 2.6.11.1 at least gets Unslung building again. -# - mwester 16 Dec 2006 -# -PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/sane-srcrevs.inc diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index d3345b469b..841b360f0d 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -22,6 +22,8 @@ PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" PCMCIA_MANAGER ?= "pcmciautils" +IMAGE_FSTYPES += "jffs2" + MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2" MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_FEATURES_append_akita = " usbhost " diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py index 5658c1662d..21e02adbf3 100755 --- a/contrib/oe-stylize.py +++ b/contrib/oe-stylize.py @@ -195,7 +195,6 @@ OE_vars = [ 'UBOOT_MACHINE', 'UCLIBC_BASE', 'UCLIBC_PATCHES', - 'UNSLUNG_PACKAGES', 'VIRTUAL_NAME', 'XORG_PN', 'XSERVER', diff --git a/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb b/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb index c6761c99b2..5e2bbb83cc 100644 --- a/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb +++ b/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb @@ -3,7 +3,7 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r2" +PR = "r3" COMPATIBLE_MACHINE = "(ixp4xx|nslu2|fsg3)" @@ -17,9 +17,9 @@ S = ${WORKDIR}/arm-kernel-shim-${PV} CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" -CMDLINE_ROOT_DSMG600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc" -CMDLINE_ROOT_NAS100D = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc" -CMDLINE_ROOT_NSLU2 = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc" +CMDLINE_ROOT_DSMG600 = "root=/dev/mtdblock2 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc" +CMDLINE_ROOT_NAS100D = "root=/dev/mtdblock2 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc" +CMDLINE_ROOT_NSLU2 = "root=/dev/mtdblock4 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc" # CMDLINE is passed correctly on the Freecom FSG-3 from the bootloader. EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb index 0d012c77f2..cc475f3bcb 100644 --- a/recipes/base-files/base-files_3.0.14.bb +++ b/recipes/base-files/base-files_3.0.14.bb @@ -155,15 +155,6 @@ PACKAGE_ARCH_rt3000 = "rt3000" PACKAGE_ARCH = "${MACHINE_ARCH}" -# Unslung distribution specific packaging - -PACKAGES_unslung = "${PN}-unslung" -PACKAGE_ARCH_${PN}-unslung = "nslu2" -RDEPENDS_${PN}-unslung = "nslu2-linksys-ramdisk" -RPROVIDES_${PN}-unslung = "${PN}" - -FILES_${PN}-unslung = "" - CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname" CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname" CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname" diff --git a/recipes/busybox/slingbox-1.3.1/defconfig b/recipes/busybox/slingbox-1.3.1/defconfig deleted file mode 100644 index 7e1f0787cf..0000000000 --- a/recipes/busybox/slingbox-1.3.1/defconfig +++ /dev/null @@ -1,675 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 1.3.1 -# Fri Dec 29 23:14:34 2006 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_NITPICK is not set -# CONFIG_DESKTOP is not set -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -CONFIG_FEATURE_COMPRESS_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_GETOPT_LONG=y -# CONFIG_FEATURE_DEVPTS is not set -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_SUID is not set -CONFIG_FEATURE_SYSLOG=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -CONFIG_FEATURE_HAVE_RPC=y -# CONFIG_SELINUX is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -# CONFIG_BUILD_AT_ONCE is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_NO_DEBUG_LIB is not set -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -CONFIG_DEBUG_YANK_SUSv2=y - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y -CONFIG_CPIO=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -# CONFIG_FEATURE_TAR_LZMA is not set -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -CONFIG_FEATURE_TAR_COMPRESS=y -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -CONFIG_UNCOMPRESS=y -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set -# CONFIG_FEATURE_DEB_TAR_LZMA is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_CMP is not set -# CONFIG_COMM is not set -CONFIG_CP=y -CONFIG_CUT=y -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -CONFIG_DD=y -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_BINARY is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_FEATURE_DIFF_MINIMAL is not set -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -# CONFIG_ENV is not set -# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set -CONFIG_EXPR=y -# CONFIG_EXPR_MATH_SUPPORT_64 is not set -# CONFIG_FALSE is not set -# CONFIG_FOLD is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set -CONFIG_ID=y -# CONFIG_INSTALL is not set -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LENGTH is not set -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -# CONFIG_FEATURE_MV_LONG_OPTIONS is not set -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -# CONFIG_PRINTF is not set -CONFIG_PWD=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_SEQ is not set -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set -CONFIG_SORT=y -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -# CONFIG_STTY is not set -# CONFIG_SUM is not set -CONFIG_SYNC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TEST=y -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_TRUE is not set -# CONFIG_TTY is not set -CONFIG_UNAME=y -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -# CONFIG_WATCH is not set -# CONFIG_WC is not set -# CONFIG_FEATURE_WC_LARGE is not set -# CONFIG_WHO is not set -# CONFIG_WHOAMI is not set -# CONFIG_YES is not set - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -# CONFIG_LOADFONT is not set -# CONFIG_LOADKMAP is not set -# CONFIG_OPENVT is not set -# CONFIG_RESET is not set -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_READLINK is not set -# CONFIG_FEATURE_READLINK_FOLLOW is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set - -# -# Editors -# -# CONFIG_AWK is not set -# CONFIG_FEATURE_AWK_MATH is not set -# CONFIG_ED is not set -# CONFIG_PATCH is not set -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -# CONFIG_FEATURE_VI_USE_SIGNALS is not set -# CONFIG_FEATURE_VI_DOT_CMD is not set -# CONFIG_FEATURE_VI_READONLY is not set -# CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set -# CONFIG_FEATURE_VI_WIN_RESIZE is not set -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y - -# -# Finding Utilities -# -CONFIG_FIND=y -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -# CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_DEBUG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_HALT=y -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_ADDUSER is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_LOGIN is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_SU is not set -# CONFIG_SU_SYSLOG is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_E2FSCK is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_MKE2FS is not set -# CONFIG_TUNE2FS is not set -# CONFIG_E2LABEL is not set -# CONFIG_FINDFS is not set - -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_RMMOD=y -CONFIG_LSMOD=y -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set -# CONFIG_FEATURE_MODPROBE_FANCY_ALIAS is not set - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_2_4_MODULES=y -# CONFIG_FEATURE_2_6_MODULES is not set -CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -CONFIG_FREERAMDISK=y -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -CONFIG_MKSWAP=y -# CONFIG_FEATURE_MKSWAP_V0 is not set -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_NFS=y -# CONFIG_FEATURE_MOUNT_CIFS is not set -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -# CONFIG_READPROFILE is not set -# CONFIG_SETARCH is not set -CONFIG_SWAPONOFF=y -# CONFIG_SWITCH_ROOT is not set -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_CROND is not set -# CONFIG_DEBUG_CROND_OPTION is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_EJECT is not set -# CONFIG_LAST is not set -# CONFIG_LESS is not set -# CONFIG_FEATURE_LESS_BRACKETS is not set -# CONFIG_FEATURE_LESS_FLAGS is not set -# CONFIG_FEATURE_LESS_FLAGCS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_NMETER is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -# CONFIG_SETSID is not set -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_TIME is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_FEATURE_IPV6 is not set -# CONFIG_ARPING is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -# CONFIG_IFUPDOWN is not set -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_IPX is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_FEATURE_IP_ADDRESS is not set -# CONFIG_FEATURE_IP_LINK is not set -# CONFIG_FEATURE_IP_ROUTE is not set -# CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_FEATURE_IP_RULE is not set -# CONFIG_FEATURE_IP_SHORT_FORMS is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_IPRULE is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -CONFIG_NC=y -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set -# CONFIG_NETSTAT is not set -# CONFIG_NSLOOKUP is not set -CONFIG_PING=y -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_PING6 is not set -# CONFIG_FEATURE_FANCY_PING6 is not set -CONFIG_ROUTE=y -# CONFIG_TELNET is not set -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_TFTP is not set -# CONFIG_FEATURE_TFTP_GET is not set -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_DEBUG_TFTP is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_APP_UDHCPD is not set -# CONFIG_APP_DHCPRELAY is not set -# CONFIG_APP_DUMPLEASES is not set -# CONFIG_APP_UDHCPC is not set -# CONFIG_FEATURE_UDHCP_SYSLOG is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -# CONFIG_FEATURE_WGET_STATUSBAR is not set -# CONFIG_FEATURE_WGET_AUTHENTICATION is not set -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -# CONFIG_ZCIP is not set - -# -# Process Utilities -# -CONFIG_FREE=y -# CONFIG_FUSER is not set -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_KILLALL5 is not set -CONFIG_PIDOF=y -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -CONFIG_PS=y -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_UPTIME is not set - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set -# CONFIG_ASH_ALIAS is not set -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -# CONFIG_ASH_GETOPTS is not set -# CONFIG_ASH_BUILTIN_ECHO is not set -# CONFIG_ASH_BUILTIN_TEST is not set -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set -# CONFIG_HUSH is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -# CONFIG_FEATURE_SH_EXTRA_QUIET is not set -# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set -CONFIG_FEATURE_COMMAND_EDITING=y -# CONFIG_FEATURE_COMMAND_EDITING_VI is not set -CONFIG_FEATURE_COMMAND_HISTORY=15 -# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set -CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y -# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set -# CONFIG_FEATURE_SH_FANCY_PROMPT is not set - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE= -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -CONFIG_KLOGD=y -# CONFIG_LOGGER is not set - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_SV is not set -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set diff --git a/recipes/busybox/slingbox-1.3.1/df_rootfs.patch b/recipes/busybox/slingbox-1.3.1/df_rootfs.patch deleted file mode 100644 index 3819b59106..0000000000 --- a/recipes/busybox/slingbox-1.3.1/df_rootfs.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- busybox-1.3.1.orig/coreutils/df.c 2006-12-26 22:54:50.000000000 -0600 -+++ busybox-1.3.1/coreutils/df.c 2006-12-30 00:45:10.000000000 -0600 -@@ -47,6 +47,7 @@ - struct statfs s; - static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */ - const char *disp_units_hdr = hdr_1k; -+ int root_done = 0; - - #ifdef CONFIG_FEATURE_HUMAN_READABLE - opt_complementary = "h-km:k-hm:m-hk"; -@@ -77,7 +78,7 @@ - - do { - const char *device; -- const char *mount_point; -+ char *mount_point; - - if (mount_table) { - mount_entry = getmntent(mount_table); -@@ -116,17 +117,20 @@ - ) / (blocks_used + s.f_bavail); - } - -- if (strcmp(device, "rootfs") == 0) { -- continue; -- } else if (strcmp(device, "/dev/root") == 0) { -+ if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) { - /* Adjusts device to be the real root device, - * or leaves device alone if it can't find it */ -- device = find_block_device("/"); -+ device = find_block_device(mount_point); - if (!device) { - goto SET_ERROR; - } - } - -+ if (strcmp(mount_point, "/") == 0) { -+ if (root_done) continue; -+ root_done = 1; -+ } -+ - #ifdef CONFIG_FEATURE_HUMAN_READABLE - printf("%-20s %9s ", device, - make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); diff --git a/recipes/busybox/slingbox-1.3.1/fdisk-readhex.patch b/recipes/busybox/slingbox-1.3.1/fdisk-readhex.patch deleted file mode 100644 index d8e32c40e7..0000000000 --- a/recipes/busybox/slingbox-1.3.1/fdisk-readhex.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- busybox-1.3.1/util-linux/fdisk.c.orig 2007-06-06 21:18:45.000000000 -0500 -+++ busybox-1.3.1/util-linux/fdisk.c 2007-06-06 21:17:20.000000000 -0500 -@@ -331,13 +331,16 @@ - read_hex(const struct systypes *sys) - { - unsigned long v; -+ char *e; - while (1) { - read_nonempty(_("Hex code (type L to list codes): ")); - if (*line_ptr == 'l' || *line_ptr == 'L') { - list_types(sys); - continue; - } -- v = bb_strtoul(line_ptr, NULL, 16); -+ v = bb_strtoul(line_ptr, &e, 16); -+ /* Clear out EINVAL code if it's because of the trailing \n */ -+ if ((errno == EINVAL) && (*e == '\n')) errno = 0; - if (errno || v > 0xff) continue; - return v; - } diff --git a/recipes/busybox/slingbox-1.3.1/halt.patch b/recipes/busybox/slingbox-1.3.1/halt.patch deleted file mode 100644 index 729c3b7ecd..0000000000 --- a/recipes/busybox/slingbox-1.3.1/halt.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur busybox-1.3.1.orig/init/halt.c busybox-1.3.1/init/halt.c ---- busybox-1.3.1.orig/init/halt.c 2006-12-26 22:56:38.000000000 -0600 -+++ busybox-1.3.1/init/halt.c 2006-12-29 22:48:18.000000000 -0600 -@@ -10,6 +10,8 @@ - #include "busybox.h" - #include <sys/reboot.h> - -+#include "init_shared.h" /* Linksys mods */ -+ - int halt_main(int argc, char *argv[]) - { - static const int magic[] = { -@@ -38,6 +40,12 @@ - if (flags & 1) sleep(xatou(delay)); - if (!(flags & 2)) sync(); - -+/* Linksys Halt code - adapted from the Linksys source for Busybox. */ -+ rc = bb_shutdown_system(magic[which]); -+ if (rc) bb_error_msg("No."); -+ return rc; /* Shrug */ -+/* End of Linksys code */ -+ - /* Perform action. */ - if (ENABLE_INIT && !(flags & 4)) { - if (ENABLE_FEATURE_INITRD) { -diff -Naur busybox-1.3.1.orig/init/init_shared.c busybox-1.3.1/init/init_shared.c ---- busybox-1.3.1.orig/init/init_shared.c 2006-12-26 22:56:38.000000000 -0600 -+++ busybox-1.3.1/init/init_shared.c 2006-12-29 22:48:18.000000000 -0600 -@@ -57,6 +57,11 @@ - - sync(); - -+/* Linksys Halt code - if poweroff or halt, invoke an external program -+ to do actually turn off the power. */ -+ if (magic != 0x01234567) system("/usr/bin/Set_Led power_off"); -+/* End of Linksys Halt code */ -+ - reboot(magic); - return 0; /* Shrug */ - } diff --git a/recipes/busybox/slingbox-1.3.1/lazy_umount.patch b/recipes/busybox/slingbox-1.3.1/lazy_umount.patch deleted file mode 100644 index 0a38d1f098..0000000000 --- a/recipes/busybox/slingbox-1.3.1/lazy_umount.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- busybox-1.3.1.orig/util-linux/umount.c 2006-12-26 22:57:04.000000000 -0600 -+++ busybox-1.3.1/util-linux/umount.c 2006-12-29 22:48:08.000000000 -0600 -@@ -12,13 +12,14 @@ - #include <mntent.h> - #include <getopt.h> - --#define OPTION_STRING "flDnravd" -+#define OPTION_STRING "flDnravdL" - #define OPT_FORCE 1 - #define OPT_LAZY 2 - #define OPT_DONTFREELOOP 4 - #define OPT_NO_MTAB 8 - #define OPT_REMOUNT 16 - #define OPT_ALL (ENABLE_FEATURE_UMOUNT_ALL ? 32 : 0) -+#define OPT_LINKSYS_LAZY 256 - - int umount_main(int argc, char **argv) - { -@@ -41,6 +42,8 @@ - argc -= optind; - argv += optind; - -+ if (opt & OPT_LINKSYS_LAZY) opt |= OPT_LAZY; /* -L same as -l */ -+ - doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY)); - - /* Get a list of mount points from mtab. We read them all in now mostly diff --git a/recipes/busybox/slingbox-1.3.1/shadow_h_is_required.patch b/recipes/busybox/slingbox-1.3.1/shadow_h_is_required.patch deleted file mode 100644 index 8012b584e4..0000000000 --- a/recipes/busybox/slingbox-1.3.1/shadow_h_is_required.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- busybox-1.3.1/include/libbb.h~ 2006-12-26 22:56:18.000000000 -0600 -+++ busybox-1.3.1/include/libbb.h 2006-12-30 01:13:51.000000000 -0600 -@@ -51,9 +51,9 @@ - - #include "pwd_.h" - #include "grp_.h" --#if ENABLE_FEATURE_SHADOWPASSWDS -+//#if ENABLE_FEATURE_SHADOWPASSWDS - #include "shadow_.h" --#endif -+//#endif - - /* Try to pull in PATH_MAX */ - #include <limits.h> diff --git a/recipes/busybox/slingbox-1.3.1/slingbox.patch b/recipes/busybox/slingbox-1.3.1/slingbox.patch deleted file mode 100644 index d0af78596a..0000000000 --- a/recipes/busybox/slingbox-1.3.1/slingbox.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- busybox-1.3.1.orig/applets/install.sh 2006-12-26 22:56:43.000000000 -0600 -+++ busybox-1.3.1/applets/install.sh 2006-12-29 22:47:42.000000000 -0600 -@@ -39,8 +39,8 @@ - done - fi - --if [ "$cleanup" = "1" ] && [ -e "$prefix/bin/busybox" ]; then -- inode=`ls -i "$prefix/bin/busybox" | awk '{print $1}'` -+if [ "$cleanup" = "1" ] && [ -e "$prefix/bin/slingbox" ]; then -+ inode=`ls -i "$prefix/bin/slingbox" | awk '{print $1}'` - sub_shell_it=` - cd "$prefix" - for d in usr/sbin usr/bin sbin bin ; do -@@ -54,28 +54,28 @@ - ` - fi - --rm -f $prefix/bin/busybox || exit 1 -+rm -f $prefix/bin/slingbox || exit 1 - mkdir -p $prefix/bin || exit 1 --install -m 755 busybox $prefix/bin/busybox || exit 1 -+install -m 755 busybox $prefix/bin/slingbox || exit 1 - - for i in $h ; do - appdir=`dirname $i` - mkdir -p $prefix/$appdir || exit 1 - if [ "$2" = "--hardlinks" ]; then -- bb_path="$prefix/bin/busybox" -+ bb_path="$prefix/bin/slingbox" - else - case "$appdir" in - /) -- bb_path="bin/busybox" -+ bb_path="bin/slingbox" - ;; - /bin) -- bb_path="busybox" -+ bb_path="slingbox" - ;; - /sbin) -- bb_path="../bin/busybox" -+ bb_path="../bin/slingbox" - ;; - /usr/bin|/usr/sbin) -- bb_path="../../bin/busybox" -+ bb_path="../../bin/slingbox" - ;; - *) - echo "Unknown installation directory: $appdir" diff --git a/recipes/busybox/slingbox-1.3.1/slingbox_name.patch b/recipes/busybox/slingbox-1.3.1/slingbox_name.patch deleted file mode 100644 index 96652c1920..0000000000 --- a/recipes/busybox/slingbox-1.3.1/slingbox_name.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- busybox-1.3.1.orig/applets/applets.c 2006-12-26 22:56:43.000000000 -0600 -+++ busybox-1.3.1/applets/applets.c 2006-12-29 22:52:31.000000000 -0600 -@@ -472,6 +472,7 @@ - if (ENABLE_FEATURE_SUID_CONFIG) parse_config_file(); - - if (!strncmp(name, "busybox", 7)) busybox_main(argc, argv); -+ if (!strncmp(name, "slingbox", 8)) busybox_main(argc, argv); - /* Do a binary search to find the applet entry given the name. */ - applet_using = find_applet_by_name(name); - if (applet_using) { diff --git a/recipes/busybox/slingbox-1.3.1/trylink-bash.patch b/recipes/busybox/slingbox-1.3.1/trylink-bash.patch deleted file mode 100644 index a1b00f6ddb..0000000000 --- a/recipes/busybox/slingbox-1.3.1/trylink-bash.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- busybox-1.3.1/scripts/trylink~ 2006-12-27 15:23:24.000000000 +1030 -+++ busybox-1.3.1/scripts/trylink 2007-12-19 15:03:20.000000000 +1030 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - debug=false - diff --git a/recipes/busybox/slingbox_1.3.1.bb b/recipes/busybox/slingbox_1.3.1.bb deleted file mode 100644 index 0a9051d447..0000000000 --- a/recipes/busybox/slingbox_1.3.1.bb +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \ -to enable ipkg to run on an Unslung NSLU2 device." -HOMEPAGE = "http://www.busybox.net" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "required" -PR = "r4" -COMPATIBLE_MACHINE = "nslu2" - -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - file://defconfig \ - file://mountall \ - file://shadow_h_is_required.patch;patch=1 \ - file://df_rootfs.patch;patch=1 \ - file://lazy_umount.patch;patch=1 \ - file://halt.patch;patch=1 \ - file://fdisk-readhex.patch;patch=1 \ - file://trylink-bash.patch;patch=1 \ - file://slingbox_name.patch;patch=1 \ - file://slingbox.patch;patch=1" - -S = "${WORKDIR}/busybox-${PV}" - -export EXTRA_CFLAGS = "${CFLAGS}" -EXTRA_OEMAKE_append = " V=1 ARCH=arm CROSS_COMPILE=${TARGET_PREFIX}" - -FILES_${PN} = "/" -FILES_${PN}-doc = "" -FILES_${PN}-dev = "" -FILES_${PN}-locale = "" - -inherit cml1 - -do_configure () { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - cml1_do_configure -} - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - base_do_compile -} - -do_install () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake "PREFIX=${D}" install - - # Just in case fdisk is compiled in, do not overwrite the Linksys one - rm -f ${S}/_install/sbin/fdisk - - cp -pPR ${S}/_install/* ${D}/ -} diff --git a/recipes/glibc/glibc-initial_2.2.5.bb b/recipes/glibc/glibc-initial_2.2.5.bb index a2e656035e..84412bd596 100644 --- a/recipes/glibc/glibc-initial_2.2.5.bb +++ b/recipes/glibc/glibc-initial_2.2.5.bb @@ -3,5 +3,3 @@ require glibc-initial.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - -PROVIDES_unslung = "virtual/${TARGET_PREFIX}libc-initial" diff --git a/recipes/glibc/glibc_2.2.5.bb b/recipes/glibc/glibc_2.2.5.bb index 7cb6681a31..eac696da13 100644 --- a/recipes/glibc/glibc_2.2.5.bb +++ b/recipes/glibc/glibc_2.2.5.bb @@ -23,8 +23,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -PROVIDES_unslung = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc libc6-unslung" - libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale" @@ -195,21 +193,3 @@ do_stage() { } require glibc-package.bbclass - - -# Unslung distribution specific packages follow ... - -PACKAGES_unslung = "libc6-unslung libsegfault" -PACKAGE_ARCH_unslung = "nslu2" -PACKAGE_NO_GCONV_unslung = "1" -RDEPENDS_libc6-unslung = "nslu2-linksys-libs" -RPROVIDES_libc6-unslung = "libc6" - -FILES_libc6-unslung = "/lib/librt*" - -# For some reason, ldconfig segfaults on nslu2. -# FILES_libc6-unslung += " /sbin/ldconfig" - -# For some reason, libnss_compat causes segmentation faults on nslu2. -# FILES_libc6-unslung += " /lib/libnss_compat*" - diff --git a/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch b/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch index b8c6d1a960..8b4ebf7141 100644 --- a/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch +++ b/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch @@ -41,7 +41,7 @@ diff -urNd ../gpe-calculator-0.2-r0/gpe-calculator-0.2/Makefile gpe-calculator-0 install -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications - strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/bin -+ install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) clean: rm -f $(PACKAGE) $(OBJS) $(DEPS) diff --git a/recipes/gpe-confd/files/makefile-fix.patch b/recipes/gpe-confd/files/makefile-fix.patch new file mode 100644 index 0000000000..ac3483e1c5 --- /dev/null +++ b/recipes/gpe-confd/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2004-08-29 13:59:52.000000000 +0200 ++++ gpe-confd-0.16/Makefile 2009-05-01 15:33:00.000000000 +0200 +@@ -32,7 +32,7 @@ + + install-program: $(PACKAGE) + install -d $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)/etc/X11/Xsession.d + install $(PACKAGE).xs $(DESTDIR)/etc/X11/Xsession.d/70gpe-confd + diff --git a/recipes/gpe-confd/gpe-confd_0.16.bb b/recipes/gpe-confd/gpe-confd_0.16.bb index b9c31029e2..6b5010784b 100644 --- a/recipes/gpe-confd/gpe-confd_0.16.bb +++ b/recipes/gpe-confd/gpe-confd_0.16.bb @@ -6,3 +6,4 @@ DESCRIPTION = "GPE configuration daemon" LICENSE = "GPL" PR = "r1" +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/gpe-go/gpe-go-0.05/fix-make.patch b/recipes/gpe-go/gpe-go-0.05/fix-make.patch index dab1c7f9ac..996c51e001 100644 --- a/recipes/gpe-go/gpe-go-0.05/fix-make.patch +++ b/recipes/gpe-go/gpe-go-0.05/fix-make.patch @@ -212,7 +212,7 @@ diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/Makefile gpe-go-0.05/Makefile install-program: $(PACKAGE).desktop all - install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -s -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) install -d $(DESTDIR)$(PREFIX)/share/pixmaps install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/ install -d $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch b/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch index d2fdd54c81..4ec5b3a682 100644 --- a/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch +++ b/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch @@ -278,7 +278,7 @@ diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile gpe-lights-0.12/Makefi install-program: all - install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -s -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) install -d $(DESTDIR)$(PREFIX)/share/pixmaps install -d $(DESTDIR)$(PREFIX)/share/applications install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/ diff --git a/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch b/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch index bb0ec196de..3c4581eded 100644 --- a/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch +++ b/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch @@ -278,7 +278,7 @@ diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile gpe-lights-0.12/Makefi install-program: all - install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -s -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) install -d $(DESTDIR)$(PREFIX)/share/pixmaps install -d $(DESTDIR)$(PREFIX)/share/applications install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/ diff --git a/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch b/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch index 42b5c3628c..b6dc568151 100644 --- a/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch +++ b/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch @@ -8,8 +8,8 @@ diff -urNd ../gpe-nmf-0.17-r0/gpe-nmf-0.17/backend/Makefile gpe-nmf-0.17/backend -install_program: all +install-program: all mkdir -p $(DESTDIR)$(PREFIX)/lib - install -s $(BACKEND) $(DESTDIR)$(PREFIX)/lib/$(BACKEND) - for i in $(CODECS); do install -s $$i $(DESTDIR)$(PREFIX)/lib/gpe-nmf/decoders/$$i; done + install $(BACKEND) $(DESTDIR)$(PREFIX)/lib/$(BACKEND) + for i in $(CODECS); do install $$i $(DESTDIR)$(PREFIX)/lib/gpe-nmf/decoders/$$i; done diff -urNd ../gpe-nmf-0.17-r0/gpe-nmf-0.17/Makefile gpe-nmf-0.17/Makefile --- ../gpe-nmf-0.17-r0/gpe-nmf-0.17/Makefile 2004-08-03 03:31:46.000000000 +0100 +++ gpe-nmf-0.17/Makefile 2004-08-03 12:37:33.000000000 +0100 diff --git a/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch b/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch index 1c43724c25..def1915f2b 100644 --- a/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch +++ b/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch @@ -278,7 +278,7 @@ diff -urNd ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/Makefile gpe-othello-0.2-1/ install-program: all - install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -s -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) install -d $(DESTDIR)$(PREFIX)/share/pixmaps install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/ install -d $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/gpe-question/files/makefile-fix.patch b/recipes/gpe-question/files/makefile-fix.patch index a8d1eadee2..f501e124e5 100644 --- a/recipes/gpe-question/files/makefile-fix.patch +++ b/recipes/gpe-question/files/makefile-fix.patch @@ -5,7 +5,7 @@ install-program: all - install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) clean: rm -f $(PACKAGE).o $(PACKAGE) $(DEPS) diff --git a/recipes/gpe-soundbite/files/makefile-fix.patch b/recipes/gpe-soundbite/files/makefile-fix.patch index c2f14d17d7..69a82b3daf 100644 --- a/recipes/gpe-soundbite/files/makefile-fix.patch +++ b/recipes/gpe-soundbite/files/makefile-fix.patch @@ -5,7 +5,7 @@ install-program: all $(PACKAGE)-play.desktop $(PACKAGE)-record.desktop - install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) install -D $(PACKAGE)-play $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)-play install -D $(PACKAGE)-record $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)-record mkdir -p $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/gpe-su/files/makefile-fix.patch b/recipes/gpe-su/files/makefile-fix.patch new file mode 100644 index 0000000000..cce98b1656 --- /dev/null +++ b/recipes/gpe-su/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2008-07-14 22:34:47.000000000 +0200 ++++ gpe-su-0.20/Makefile 2009-05-01 16:02:11.000000000 +0200 +@@ -34,7 +34,7 @@ + + install-program: all $(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -m 755 -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -m 755 $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/applications + install -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps diff --git a/recipes/gpe-su/gpe-su.inc b/recipes/gpe-su/gpe-su.inc index 3daa0b9e0a..287915e6f6 100644 --- a/recipes/gpe-su/gpe-su.inc +++ b/recipes/gpe-su/gpe-su.inc @@ -6,3 +6,5 @@ DEPENDS = "libgpewidget virtual/libintl" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" inherit gpe pkgconfig + +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/images/slugos-extd-image.bb b/recipes/images/slugos-extd-image.bb new file mode 100644 index 0000000000..fa027803a3 --- /dev/null +++ b/recipes/images/slugos-extd-image.bb @@ -0,0 +1,17 @@ +# This describes the SlugOS Extended image, which includes everything +# that is in the standard NSLU2 image, with a few extra drivers. This +# image is usually used with other IXP4xx machines, such as the D-Link +# DSM-G600A and the NAS100D + +DESCRIPTION = "SlugOS Extended image" + +PR = "r1" + +require slugos-image.inc + +IMAGE_NAME = "${IMAGE_BASENAME}-extd-${DISTRO_VERSION}" +DEPENDS += "task-slugos-extd" +IMAGE_INSTALL += "task-slugos-extd" + +# Todo: fix these image creation tools +#inherit dsmg600-image nas100d-image diff --git a/recipes/images/slugos-image.bb b/recipes/images/slugos-image.bb index 56abc3d39f..24e83f0b66 100644 --- a/recipes/images/slugos-image.bb +++ b/recipes/images/slugos-image.bb @@ -2,34 +2,11 @@ # called 'slugos-image.bb' the distro specific configuration is # done in conf/distro/${DISTRO}.conf (which should always include # conf/distro/slugos.conf to get the standard settings). -# -DESCRIPTION = "Generic SlugOS image" -HOMEPAGE = "http://www.nslu2-linux.org" - -DEPENDS = "task-slugos" -IMAGE_INSTALL = "task-slugos" - -COMPATIBLE_MACHINE = "nslu2|ixp4xx" -IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}" -IMAGE_FSTYPES = "jffs2 tar.gz" -EXTRA_IMAGECMD_jffs2 += " -D ${SLUGOS_DEVICE_TABLE}" -IMAGE_LINGUAS = "" - -# Setting USE_DEVFS prevents *any* entries being created initially -# in /dev -USE_DEVFS = "1" +DESCRIPTION = "Generic SlugOS image" -# This is passed to the image command to build the correct /dev -# directory (because only the image program can make actual -# dev entries!) -SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" +PR = "r1" -# IMAGE_PREPROCESS_COMMAND is run before making the image. In SlugOS the -# kernel image is removed from the root file system to recover the space used - -# SlugOS is assumed to boot from a separate kernel image in flash (not in the -# root file system), if this is not the case the following must not be done! -IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/boot/zImage*;" -IMAGE_PREPROCESS_COMMAND += "install -c -m 644 ${SLUGOS_DEVICE_TABLE} ${IMAGE_ROOTFS}/etc/device_table;" +require slugos-image.inc -inherit image nslu2-image +inherit nslu2-image diff --git a/recipes/images/slugos-image.inc b/recipes/images/slugos-image.inc new file mode 100644 index 0000000000..725d1fac61 --- /dev/null +++ b/recipes/images/slugos-image.inc @@ -0,0 +1,24 @@ +# This describes a generic SlugOS image, even though the bb file is +# called 'slugos-image.bb' the distro specific configuration is +# done in conf/distro/${DISTRO}.conf (which should always include +# conf/distro/slugos.conf to get the standard settings). + +HOMEPAGE = "http://www.nslu2-linux.org" + +DEPENDS = "task-slugos" +IMAGE_INSTALL = "task-slugos" + +COMPATIBLE_MACHINE = "nslu2|ixp4xx|sheevaplug" + +IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}" +IMAGE_FSTYPES = "jffs2 tar.gz" +IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" +IMAGE_LINGUAS = "" + +# IMAGE_PREPROCESS_COMMAND is run before making the image. In SlugOS the +# kernel image is removed from the root file system to recover the space used - +# SlugOS is assumed to boot from a separate kernel image in flash (not in the +# root file system), if this is not the case the following must not be done! +IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/boot/zImage*;" + +inherit image diff --git a/recipes/images/unslung-image.bb b/recipes/images/unslung-image.bb deleted file mode 100644 index 9ac4140a14..0000000000 --- a/recipes/images/unslung-image.bb +++ /dev/null @@ -1,111 +0,0 @@ -COMPATIBLE_MACHINE = "nslu2" - -IMAGE_BASENAME = "unslung" -IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}" - -IMAGE_LINGUAS = "" -USE_DEVFS = "1" - -DEPENDS = "virtual/kernel \ - ${UNSLUNG_EXTRA_DEPENDS}" - -IMAGE_INSTALL = "kernel update-modules unslung-rootfs \ - libc6-unslung slingbox ipkg libipkg libgcc \ - kernel-module-netconsole \ - ${UNSLUNG_EXTRA_INSTALL}" - -IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; " - -inherit image - -# Note that anything in this function must be repeatable without having to rebuild the rootfs -unslung_clean_image () { - - # Remove the patches - rm -rf ${IMAGE_ROOTFS}/patches - - # Remove the kernel image - rm -rf ${IMAGE_ROOTFS}/boot - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/zImage - # And remove the post and pre scripts for the kernel; saves flash space - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/kernel.postinst - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/kernel.postrm - - # Remove all the postinst scripts; don't need them. But keep the - # postrm scripts just in case we need to remove something. - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.postinst - - # Remove info from the local feed used to build the image - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/* - rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version - - # Tidy up some thing which are in the wrong place - mv ${IMAGE_ROOTFS}${libdir}/libipkg* ${IMAGE_ROOTFS}/lib/ - - # Remove the ipkg symlink - unsling puts it back in - rm -f ${IMAGE_ROOTFS}${bindir}/ipkg - # and make the ipkg symlink point to the ipkg-fl utility instead. - ln -s ipkg-fl ${IMAGE_ROOTFS}${bindir}/ipkg - - # Hack out the modutils stuff - it's too hard to make it work - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/update-modules.postinst - rm -rf ${IMAGE_ROOTFS}/etc/rcS.d - echo "#!/bin/sh" > ${IMAGE_ROOTFS}/usr/sbin/update-modules - echo "exit 0" >> ${IMAGE_ROOTFS}/usr/sbin/update-modules - chmod ugo+x ${IMAGE_ROOTFS}/usr/sbin/update-modules - echo "#!/bin/sh" > ${IMAGE_ROOTFS}/sbin/depmod - echo "exit 0" >> ${IMAGE_ROOTFS}/sbin/depmod - chmod ugo+x ${IMAGE_ROOTFS}/sbin/depmod - - # Don't need this empty directory hanging around - rm -rf ${IMAGE_ROOTFS}/lib/modules/2.4.22-xfs/pcmcia - - # Strip symbols and fix permissions on the libgcc_s.so.1 library - ${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 - chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 - - # FIXME: change made 24 Jul 2006 by the OE folks changes the "strip" - # behavior to create an extra file named .debug/<filename> containing - # the stripped symbols. These files are supposed to be packaged - # separately by the standard bb routines, but for some reason this - # does not alway occur. This extremely ugly step is to remove the - # debug cruft from the rootfs if any are left in the obvious locations. - # Once someone figures out why and what the right way is to fix this, - # this code should be removed. - - rm -rf ${IMAGE_ROOTFS}/bin/.debug - rm -rf ${IMAGE_ROOTFS}/sbin/.debug - rm -rf ${IMAGE_ROOTFS}/lib/.debug - rm -rf ${IMAGE_ROOTFS}/usr/bin/.debug - rm -rf ${IMAGE_ROOTFS}/usr/sbin/.debug - rm -rf ${IMAGE_ROOTFS}/usr/lib/.debug - -# MJW - Experimental - just to make space; remove before releasing! -# #### Hack to make space for testing! REMOVE THIS! -# rm -rf ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.850 -# rm -rf ${IMAGE_ROOTFS}/bin/ftp -# #### End of Hack! - -} - - -# Override this function for unslung, since we don't need Apex. - -nslu2_pack_image () { - slugimage -p \ - -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ - -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ - -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \ - -r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - -m ${STAGING_FIRMWARE_DIR}/NPE-B \ - -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin - slugimage -F -p \ - -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ - -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ - -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \ - -r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - -m ${STAGING_FIRMWARE_DIR}/NPE-B \ - -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin -} diff --git a/recipes/initscripts/initscripts-slugos_1.0.bb b/recipes/initscripts/initscripts-slugos_1.0.bb index 29209dbf6a..d04d038eca 100644 --- a/recipes/initscripts/initscripts-slugos_1.0.bb +++ b/recipes/initscripts/initscripts-slugos_1.0.bb @@ -1,9 +1,9 @@ # SlugOS specific stuff for the init scripts. # -# This is, in effect, an extended patch to fix various -# problems in the initscripts on SlugOS. The problems -# mostly come down to the order the scripts are executed -# in. +# This is, in effect, an extended patch to fix various problems +# in the initscripts on SlugOS. The problems mostly come down +# to the order in which the scripts are executed. + include initscripts_${PV}.bb RCONFLICTS = "initscripts" @@ -16,23 +16,25 @@ RDEPENDS = "" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.19" +PR := "${PR}.21" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +# We wish to search the same file paths as does the initscripts recipe. +FILESPATHPKG = "initscripts-${PV}:initscripts:files" PACKAGES = "${PN}-dbg ${PN}" SRC_URI += "file://alignment.sh" SRC_URI += "file://domainname.sh" -SRC_URI += "file://devices.patch;patch=1" SRC_URI += "file://bootclean.sh" # Without this it is not possible to patch checkroot S = "${WORKDIR}" do_install_append() { - # the image build command now installs this for slugos + # devfs is not used with SlugOS - remove all traces of it. rm ${D}${sysconfdir}/device_table + rm ${D}${sysconfdir}/init.d/devices + rm ${D}${sysconfdir}/rcS.d/S05devices # slugos specific scripts install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d @@ -68,7 +70,6 @@ do_install_append() { rm ${D}${sysconfdir}/rcS.d/S55bootmisc.sh # rm ${D}${sysconfdir}/rcS.d/S55urandom rm ${D}${sysconfdir}/rcS.d/S99finish.sh - rm ${D}${sysconfdir}/rcS.d/S05devices # udev will run at S04 if installed rm ${D}${sysconfdir}/rcS.d/S03sysfs rm ${D}${sysconfdir}/rcS.d/S38devpts.sh @@ -100,7 +101,6 @@ do_install_append() { update-rc.d -r ${D} banner start 2 S . update-rc.d -r ${D} sysfs.sh start 3 S . # udev runs at S 04 . - update-rc.d -r ${D} devices start 5 S . update-rc.d -r ${D} alignment.sh start 7 S . # busybox hwclock.sh (slugos-init) starts here (08) # slugos-init umountinitrd runs here (09) diff --git a/recipes/ipaq-sleep/files/install-fix.patch b/recipes/ipaq-sleep/files/install-fix.patch index 59eb17b071..68e57af886 100644 --- a/recipes/ipaq-sleep/files/install-fix.patch +++ b/recipes/ipaq-sleep/files/install-fix.patch @@ -5,7 +5,7 @@ install-program: all - install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) mkdir -p $(DESTDIR)/etc/init.d install $(PACKAGE).init $(DESTDIR)/etc/init.d/$(PACKAGE) install $(PACKAGE).conf $(DESTDIR)/etc/$(PACKAGE).conf diff --git a/recipes/libdisplaymigration/files/makefile-fix.patch b/recipes/libdisplaymigration/files/makefile-fix.patch new file mode 100644 index 0000000000..5a79ab22de --- /dev/null +++ b/recipes/libdisplaymigration/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile 2005-02-28 20:32:13.000000000 +0100 ++++ libdisplaymigration-0.99/Makefile 2009-05-01 14:26:17.000000000 +0200 +@@ -36,7 +36,7 @@ + + install-program: $(SONAME) + install -d $(DESTDIR)$(PREFIX)/lib +- install -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/$(SONAME) ++ install $(SONAME) $(DESTDIR)$(PREFIX)/lib/$(SONAME) + + install-devel: + for i in $(HEADERS); do install -m 644 -D $$i $(DESTDIR)$(PREFIX)/include/$$i; done diff --git a/recipes/libdisplaymigration/libdisplaymigration_0.28.bb b/recipes/libdisplaymigration/libdisplaymigration_0.28.bb index e92cf57ce8..8f85dff044 100644 --- a/recipes/libdisplaymigration/libdisplaymigration_0.28.bb +++ b/recipes/libdisplaymigration/libdisplaymigration_0.28.bb @@ -7,6 +7,8 @@ PR = "r1" inherit pkgconfig gpe +SRC_URI += "file://makefile-fix.patch;patch=1" + headers = "displaymigration.h auth.h crypt.h" do_install() { diff --git a/recipes/libdisplaymigration/libdisplaymigration_0.99.bb b/recipes/libdisplaymigration/libdisplaymigration_0.99.bb index 0563ba3eea..033005d7ef 100644 --- a/recipes/libdisplaymigration/libdisplaymigration_0.99.bb +++ b/recipes/libdisplaymigration/libdisplaymigration_0.99.bb @@ -7,6 +7,8 @@ PR = "r0" inherit pkgconfig gpe +SRC_URI += "file://makefile-fix.patch;patch=1" + headers = "displaymigration.h auth.h crypt.h" do_install() { diff --git a/recipes/linux/unslung-kernel/anonymiser.patch b/recipes/linux/unslung-kernel/anonymiser.patch deleted file mode 100644 index 61201031fa..0000000000 --- a/recipes/linux/unslung-kernel/anonymiser.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- linux-2.4.22/Makefile.orig 2004-12-26 13:11:25.000000000 +1030 -+++ linux-2.4.22/Makefile 2004-12-26 13:12:32.000000000 +1030 -@@ -431,12 +431,15 @@ - @LANG=C echo ' '`date` >> .ver1 - @echo \#define UTS_VERSION \"`cat .ver1 | $(uts_truncate)`\" > .ver - @LANG=C echo \#define LINUX_COMPILE_TIME \"`date +%T`\" >> .ver -- @echo \#define LINUX_COMPILE_BY \"`whoami`\" >> .ver -- @echo \#define LINUX_COMPILE_HOST \"`hostname | $(uts_truncate)`\" >> .ver -- @([ -x /bin/dnsdomainname ] && /bin/dnsdomainname > .ver1) || \ -- ([ -x /bin/domainname ] && /bin/domainname > .ver1) || \ -- echo > .ver1 -- @echo \#define LINUX_COMPILE_DOMAIN \"`cat .ver1 | $(uts_truncate)`\" >> .ver -+# @echo \#define LINUX_COMPILE_BY \"`whoami`\" >> .ver -+ @echo \#define LINUX_COMPILE_BY \"unslung\" >> .ver -+# @echo \#define LINUX_COMPILE_HOST \"`hostname | $(uts_truncate)`\" >> .ver -+ @echo \#define LINUX_COMPILE_HOST \"unslung.org\" >> .ver -+# @([ -x /bin/dnsdomainname ] && /bin/dnsdomainname > .ver1) || \ -+# ([ -x /bin/domainname ] && /bin/domainname > .ver1) || \ -+# echo > .ver1 -+# @echo \#define LINUX_COMPILE_DOMAIN \"`cat .ver1 | $(uts_truncate)`\" >> .ver -+ @echo \#define LINUX_COMPILE_DOMAIN \"unslung.org\" >> .ver - @echo \#define LINUX_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -n 1`\" >> .ver - @mv -f .ver $@ - @rm -f .ver1 diff --git a/recipes/linux/unslung-kernel/config-fixes.patch b/recipes/linux/unslung-kernel/config-fixes.patch deleted file mode 100644 index 2afbe66f0a..0000000000 --- a/recipes/linux/unslung-kernel/config-fixes.patch +++ /dev/null @@ -1,34 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.4.22/drivers/usb/Config.in~linksys_can_bite_me 2004-09-08 19:14:15.000000000 -0500 -+++ linux-2.4.22/drivers/usb/Config.in 2004-09-08 19:19:37.000000000 -0500 -@@ -120,6 +120,4 @@ - fi - fi - --source drivers/usb/gadget/Config.in -- - endmenu ---- linux-2.4.22/drivers/ixp400/Makefile~linksys_can_bite_me 2004-09-08 19:14:08.000000000 -0500 -+++ linux-2.4.22/drivers/ixp400/Makefile 2004-09-08 19:32:55.000000000 -0500 -@@ -78,7 +78,9 @@ - # DAMAGE." - # - # -- End Intel/GPL Copyright Notice -- -+# - -+ifdef CONFIG_IXP425_CSR - include $(ROOTDIR)/IXP400lib/ixp400_xscale_sw/buildUtils/environment.linux - # IX_XSCALE_SW=$(ROOTDIR)/IXP400lib/ixp400_xscale_sw/ - # The kernel makefiles override the value of CFLAGS on the make -@@ -148,6 +150,7 @@ - # directory. Note that they must be filenames in this directory - the - # ramdisk rules cannot handle paths in this list. - obj-m := $(IXP400_MODULES) -+endif - - # Include the generic kernel build system rules - include $(TOPDIR)/Rules.make diff --git a/recipes/linux/unslung-kernel/defconfig b/recipes/linux/unslung-kernel/defconfig deleted file mode 100644 index 03247f74b5..0000000000 --- a/recipes/linux/unslung-kernel/defconfig +++ /dev/null @@ -1,1283 +0,0 @@ -# -# Automatically generated make config: don't edit -# -CONFIG_ARM=y -# CONFIG_EISA is not set -# CONFIG_SBUS is not set -# CONFIG_MCA is not set -CONFIG_UID16=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y -# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set -# CONFIG_GENERIC_BUST_SPINLOCK is not set -# CONFIG_GENERIC_ISA_DMA is not set - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y -# CONFIG_ADVANCED_OPTIONS is not set -# CONFIG_OBSOLETE is not set - -# -# Loadable module support -# -CONFIG_MODULES=y -# CONFIG_MODVERSIONS is not set -# CONFIG_KMOD is not set - -# -# System Type -# -# CONFIG_ARCH_ADIFCC is not set -# CONFIG_ARCH_ANAKIN is not set -# CONFIG_ARCH_ARCA5K is not set -# CONFIG_ARCH_CLPS7500 is not set -# CONFIG_ARCH_CLPS711X is not set -# CONFIG_ARCH_CO285 is not set -# CONFIG_ARCH_EBSA110 is not set -# CONFIG_ARCH_CAMELOT is not set -# CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_IOP3XX is not set -# CONFIG_ARCH_IXP1200 is not set -# CONFIG_ARCH_IXP2000 is not set -CONFIG_ARCH_IXP425=y -# CONFIG_ARCH_OMAHA is not set -# CONFIG_ARCH_L7200 is not set -# CONFIG_ARCH_MX1ADS is not set -# CONFIG_ARCH_RPC is not set -# CONFIG_ARCH_RISCSTATION is not set -# CONFIG_ARCH_SA1100 is not set -# CONFIG_ARCH_SHARK is not set -# CONFIG_ARCH_AT91RM9200 is not set - -# -# Archimedes/A5000 Implementations -# - -# -# Archimedes/A5000 Implementations (select only ONE) -# -# CONFIG_ARCH_ARC is not set -# CONFIG_ARCH_A5K is not set - -# -# Footbridge Implementations -# -# CONFIG_ARCH_CATS is not set -# CONFIG_ARCH_PERSONAL_SERVER is not set -# CONFIG_ARCH_EBSA285_ADDIN is not set -# CONFIG_ARCH_EBSA285_HOST is not set -# CONFIG_ARCH_NETWINDER is not set - -# -# SA11x0 Implementations -# -# CONFIG_SA1100_ACCELENT is not set -# CONFIG_SA1100_ASSABET is not set -# CONFIG_ASSABET_NEPONSET is not set -# CONFIG_SA1100_ADSAGC is not set -# CONFIG_SA1100_ADSBITSY is not set -# CONFIG_SA1100_ADSBITSYPLUS is not set -# CONFIG_SA1100_BRUTUS is not set -# CONFIG_SA1100_CEP is not set -# CONFIG_SA1100_CERF is not set -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set -# CONFIG_SA1100_H3XXX is not set -# CONFIG_H3600_SLEEVE is not set -# CONFIG_SA1100_EXTENEX1 is not set -# CONFIG_SA1100_FLEXANET is not set -# CONFIG_SA1100_FREEBIRD is not set -# CONFIG_SA1100_FRODO is not set -# CONFIG_SA1100_GRAPHICSCLIENT is not set -# CONFIG_SA1100_GRAPHICSMASTER is not set -# CONFIG_SA1100_HACKKIT is not set -# CONFIG_SA1100_BADGE4 is not set -# CONFIG_SA1100_JORNADA720 is not set -# CONFIG_SA1100_HUW_WEBPANEL is not set -# CONFIG_SA1100_ITSY is not set -# CONFIG_SA1100_LART is not set -# CONFIG_SA1100_NANOENGINE is not set -# CONFIG_SA1100_OMNIMETER is not set -# CONFIG_SA1100_PANGOLIN is not set -# CONFIG_SA1100_PLEB is not set -# CONFIG_SA1100_PT_SYSTEM3 is not set -# CONFIG_SA1100_SHANNON is not set -# CONFIG_SA1100_SHERMAN is not set -# CONFIG_SA1100_SIMPAD is not set -# CONFIG_SA1100_SIMPUTER is not set -# CONFIG_SA1100_PFS168 is not set -# CONFIG_SA1100_VICTOR is not set -# CONFIG_SA1100_XP860 is not set -# CONFIG_SA1100_YOPY is not set -# CONFIG_SA1100_USB is not set -# CONFIG_SA1100_USB_NETLINK is not set -# CONFIG_SA1100_USB_CHAR is not set -# CONFIG_SA1100_SSP is not set - -# -# IXP425 Implementation Options -# -CONFIG_ARCH_IXDP425=y -# CONFIG_ARCH_IXCDP1100 is not set -# CONFIG_ARCH_PRPMC1100 is not set -# CONFIG_ARCH_IXP425_COYOTE is not set -# CONFIG_ARCH_SE4000 is not set - -# -# IXP425 Options -# -CONFIG_IXP425_SDRAM_SIZE=32 -# CONFIG_IXP425_LARGE_SDRAM is not set -CONFIG_IXP425_PCI_ERRATA=y -# CONFIG_IXP425_OS_TIMER1 is not set -# CONFIG_XSCALE_PMU_TIMER is not set -# CONFIG_IXP425_CSR is not set - -# -# AT91RM9200 Implementations -# -# CONFIG_ARCH_AT91RM9200DK is not set - -# -# CLPS711X/EP721X Implementations -# -# CONFIG_ARCH_AUTCPU12 is not set -# CONFIG_ARCH_CDB89712 is not set -# CONFIG_ARCH_CLEP7312 is not set -# CONFIG_ARCH_EDB7211 is not set -# CONFIG_ARCH_FORTUNET is not set -# CONFIG_ARCH_GUIDEA07 is not set -# CONFIG_ARCH_P720T is not set -# CONFIG_ARCH_EP7211 is not set -# CONFIG_ARCH_EP7212 is not set -# CONFIG_ARCH_ACORN is not set -# CONFIG_FOOTBRIDGE is not set -# CONFIG_FOOTBRIDGE_HOST is not set -# CONFIG_FOOTBRIDGE_ADDIN is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -# CONFIG_CPU_26 is not set -# CONFIG_CPU_ARM610 is not set -# CONFIG_CPU_ARM710 is not set -# CONFIG_CPU_ARM720T is not set -# CONFIG_CPU_ARM920T is not set -# CONFIG_CPU_ARM922T is not set -# CONFIG_PLD is not set -# CONFIG_CPU_ARM926T is not set -# CONFIG_CPU_ARM1020 is not set -# CONFIG_CPU_ARM1026 is not set -# CONFIG_CPU_SA110 is not set -# CONFIG_CPU_SA1100 is not set -# CONFIG_CPU_32v3 is not set -# CONFIG_CPU_32v4 is not set -CONFIG_CPU_32v5=y -CONFIG_CPU_XSCALE=y -CONFIG_ARM_THUMB=y - -# -# Processor Features -# -# CONFIG_XSCALE_PMU_TIMER is not set -# CONFIG_XSCALE_CACHE_ERRATA is not set -# CONFIG_XSCALE_BDI2000 is not set -# CONFIG_DISCONTIGMEM is not set -CONFIG_CPU_BIG_ENDIAN=y - -# -# General setup -# -CONFIG_PCI=y -CONFIG_PCI_AUTOCONFIG=y -# CONFIG_ISA is not set -# CONFIG_ISA_DMA is not set -CONFIG_KERNEL_START=0xc0000000 -# CONFIG_ZBOOT_ROM is not set -CONFIG_ZBOOT_ROM_TEXT=0 -CONFIG_ZBOOT_ROM_BSS=0 -CONFIG_PCI_NAMES=y -# CONFIG_HOTPLUG is not set -# CONFIG_PCMCIA is not set -CONFIG_NET=y -CONFIG_SYSVIPC=y -# CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_SYSCTL=y - -# -# At least one math emulation must be selected -# -CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set -# CONFIG_FPE_FASTFPE is not set -CONFIG_KCORE_ELF=y -# CONFIG_KCORE_AOUT is not set -CONFIG_BINFMT_AOUT=y -CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_MISC=m -# CONFIG_PM is not set -# CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=ttyS0,115200n8 root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000" -CONFIG_ALIGNMENT_TRAP=y - -# -# Parallel port support -# -# CONFIG_PARPORT is not set - -# -# Memory Technology Devices (MTD) -# -CONFIG_MTD=y -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_PARTITIONS=y -# CONFIG_MTD_CONCAT is not set -CONFIG_MTD_REDBOOT_PARTS=y -# CONFIG_MTD_CMDLINE_PARTS is not set -# CONFIG_MTD_AFS_PARTS is not set - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=y -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_GEN_PROBE=y -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_CFI_INTELEXT=y -# CONFIG_MTD_CFI_AMDSTD is not set -# CONFIG_MTD_CFI_STAA is not set -# CONFIG_MTD_RAM is not set -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_OBSOLETE_CHIPS is not set -# CONFIG_MTD_AMDSTD is not set -# CONFIG_MTD_SHARP is not set -# CONFIG_MTD_JEDEC is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_DRAGONIX is not set -# CONFIG_MTD_NETtel is not set -# CONFIG_MTD_SNAPGEODE is not set -# CONFIG_MTD_NETteluC is not set -# CONFIG_MTD_MBVANILLA is not set -# CONFIG_MTD_KeyTechnology is not set -# CONFIG_MTD_NORA is not set -# CONFIG_MTD_ARM_INTEGRATOR is not set -# CONFIG_MTD_CDB89712 is not set -# CONFIG_MTD_SA1100 is not set -# CONFIG_MTD_DC21285 is not set -# CONFIG_MTD_IQ80310 is not set -# CONFIG_MTD_EPXA10DB is not set -# CONFIG_MTD_FORTUNET is not set -# CONFIG_MTD_AUTCPU12 is not set -CONFIG_MTD_IXP425=y -# CONFIG_MTD_IXP425_COYOTE is not set -# CONFIG_MTD_SE4000 is not set -# CONFIG_MTD_EDB7312 is not set -# CONFIG_MTD_IMPA7 is not set -# CONFIG_MTD_CEIVA is not set -# CONFIG_MTD_PCI is not set -# CONFIG_MTD_PCMCIA is not set - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_PMC551 is not set -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLKMTD is not set - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC1000 is not set -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOC2001PLUS is not set -# CONFIG_MTD_DOCPROBE is not set - -# -# NAND Flash Device Drivers -# -# CONFIG_MTD_NAND is not set - -# -# Plug and Play configuration -# -# CONFIG_PNP is not set -# CONFIG_ISAPNP is not set - -# -# Block devices -# -# CONFIG_BLK_DEV_FD is not set -# CONFIG_BLK_DEV_XD is not set -# CONFIG_PARIDE is not set -# CONFIG_BLK_CPQ_DA is not set -# CONFIG_BLK_CPQ_CISS_DA is not set -# CONFIG_CISS_SCSI_TAPE is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_BLK_DEV_UMEM is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_INITRD=y -# CONFIG_BLK_DEV_RAMDISK_DATA is not set -# CONFIG_BLK_DEV_BLKMEM is not set -# CONFIG_BLK_STATS is not set - -# -# Multi-device support (RAID and LVM) -# -CONFIG_MD=y -CONFIG_BLK_DEV_MD=m -# CONFIG_MD_LINEAR is not set -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID5=m -# CONFIG_MD_MULTIPATH is not set -# CONFIG_BLK_DEV_LVM is not set - -# -# Networking options -# -CONFIG_PACKET=y -# CONFIG_PACKET_MMAP is not set -# CONFIG_NETLINK_DEV is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_FILTER=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -# CONFIG_IP_MULTIPLE_TABLES is not set -# CONFIG_IP_ROUTE_MULTIPATH is not set -# CONFIG_IP_ROUTE_MULTIPATH_SEQUENTIAL is not set -# CONFIG_IP_ROUTE_TOS 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=y -# CONFIG_IP_PNP_RARP is not set -# CONFIG_NET_ARP_LIMIT is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set -# CONFIG_IP_MROUTE is not set -# CONFIG_ARPD is not set -# CONFIG_INET_ECN is not set -# CONFIG_SYN_COOKIES is not set - -# -# IP: Netfilter Configuration -# -CONFIG_IP_NF_CONNTRACK=m -CONFIG_IP_NF_FTP=m -# CONFIG_IP_NF_H323 is not set -# CONFIG_IP_NF_AMANDA is not set -# CONFIG_IP_NF_TFTP is not set -# CONFIG_IP_NF_IRC is not set -# CONFIG_IP_NF_CT_PROTO_GRE is not set -# CONFIG_IP_NF_PPTP is not set -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_LIMIT=m -CONFIG_IP_NF_MATCH_MAC=m -CONFIG_IP_NF_MATCH_PKTTYPE=m -CONFIG_IP_NF_MATCH_MARK=m -CONFIG_IP_NF_MATCH_MULTIPORT=m -CONFIG_IP_NF_MATCH_TOS=m -CONFIG_IP_NF_MATCH_RECENT=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_DSCP=m -CONFIG_IP_NF_MATCH_AH_ESP=m -CONFIG_IP_NF_MATCH_LENGTH=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_TCPMSS=m -CONFIG_IP_NF_MATCH_HELPER=m -CONFIG_IP_NF_MATCH_STATE=m -CONFIG_IP_NF_MATCH_CONNTRACK=m -CONFIG_IP_NF_MATCH_UNCLEAN=m -CONFIG_IP_NF_MATCH_OWNER=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_MIRROR=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m -# CONFIG_IP_NF_NAT_LOCAL is not set -# CONFIG_IP_NF_NAT_SNMP_BASIC is not set -CONFIG_IP_NF_NAT_FTP=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_TOS=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_DSCP=m -CONFIG_IP_NF_TARGET_MARK=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_TARGET_TCPMSS=m -# CONFIG_IP_NF_ARPTABLES is not set -# CONFIG_IP_NF_COMPAT_IPCHAINS is not set -# CONFIG_IP_NF_COMPAT_IPFWADM is not set -# CONFIG_IPV6 is not set -# CONFIG_KHTTPD is not set -# CONFIG_ATM is not set -# CONFIG_VLAN_8021Q is not set - -# -# -# -# CONFIG_IPX is not set -CONFIG_ATALK=m - -# -# Appletalk devices -# -CONFIG_DEV_APPLETALK=y -# CONFIG_COPS_DAYNA is not set -# CONFIG_COPS_TANGENT is not set -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -# CONFIG_DECNET is not set -CONFIG_BRIDGE=m -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_IPF=m -CONFIG_BRIDGE_EBT_ARPF=m -CONFIG_BRIDGE_EBT_VLANF=m -CONFIG_BRIDGE_EBT_MARKF=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_MARK_T=m -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_LLC is not set -# CONFIG_NET_DIVERT is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set -# CONFIG_NET_FASTROUTE is not set -# CONFIG_NET_HW_FLOWCONTROL is not set - -# -# QoS and/or fair queueing -# -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_CSZ=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_INGRESS=m -# CONFIG_NET_QOS is not set -CONFIG_NET_CLS=y -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_IPSEC is not set - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set - -# -# Network device support -# -CONFIG_NETDEVICES=y - -# -# ARCnet devices -# -# CONFIG_ARCNET is not set -# CONFIG_DUMMY is not set -# CONFIG_BONDING is not set -# CONFIG_EQUALIZER is not set -CONFIG_TUN=m -CONFIG_ETHERTAP=m - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -# CONFIG_ARM_AM79C961A is not set -# CONFIG_ARM_CIRRUS is not set -# CONFIG_IXP425_ETH is not set -# CONFIG_SUNLANCE is not set -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNBMAC is not set -# CONFIG_SUNQE is not set -# CONFIG_SUNGEM is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_LANCE is not set -# CONFIG_NET_VENDOR_SMC is not set -# CONFIG_NET_VENDOR_RACAL is not set -# CONFIG_HP100 is not set -# CONFIG_NET_ISA is not set -CONFIG_NET_PCI=y -# CONFIG_PCNET32 is not set -# CONFIG_AMD8111_ETH is not set -# CONFIG_ADAPTEC_STARFIRE is not set -# CONFIG_APRICOT is not set -# CONFIG_B44 is not set -# CONFIG_CS89x0 is not set -# CONFIG_TULIP is not set -# CONFIG_DE4X5 is not set -# CONFIG_DGRS is not set -# CONFIG_DM9102 is not set -# CONFIG_EEPRO100 is not set -# CONFIG_EEPRO100_PIO is not set -# CONFIG_E100 is not set -# CONFIG_LNE390 is not set -# CONFIG_FEALNX is not set -# CONFIG_NATSEMI is not set -# CONFIG_NE2K_PCI is not set -# CONFIG_NE3210 is not set -# CONFIG_ES3210 is not set -# CONFIG_8139CP is not set -# CONFIG_8139CP_EXTERNAL_PHY is not set -CONFIG_8139CP_PHY_NUM=32 -# CONFIG_8139TOO is not set -# CONFIG_8139TOO_PIO is not set -# CONFIG_8139TOO_TUNE_TWISTER is not set -# CONFIG_8139TOO_8129 is not set -# CONFIG_8139_OLD_RX_RESET is not set -# CONFIG_RTL8139 is not set -# CONFIG_SIS900 is not set -# CONFIG_EPIC100 is not set -# CONFIG_SUNDANCE is not set -# CONFIG_SUNDANCE_MMIO is not set -# CONFIG_TLAN is not set -# CONFIG_VIA_RHINE is not set -# CONFIG_VIA_RHINE_FET is not set -# CONFIG_VIA_RHINE_MMIO is not set -# CONFIG_WINBOND_840 is not set -# CONFIG_NET_POCKET is not set -# CONFIG_FEC is not set -# CONFIG_CS89x0 is not set -# CONFIG_UCCS8900 is not set - -# -# Ethernet (1000 Mbit) -# -# CONFIG_ACENIC is not set -# CONFIG_DL2K is not set -# CONFIG_E1000 is not set -# CONFIG_MYRI_SBUS is not set -# CONFIG_NS83820 is not set -# CONFIG_HAMACHI is not set -# CONFIG_YELLOWFIN is not set -# CONFIG_R8169 is not set -# CONFIG_SK98LIN is not set -# CONFIG_TIGON3 is not set -# CONFIG_FDDI is not set -CONFIG_NETCONSOLE=m -# CONFIG_HIPPI is not set -# CONFIG_PLIP is not set -CONFIG_PPP=m -# CONFIG_PPP_MULTILINK is not set -# CONFIG_PPP_FILTER is not set -CONFIG_PPP_ASYNC=m -# CONFIG_PPP_SYNC_TTY is not set -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -# CONFIG_PPPOE is not set -# CONFIG_SLIP is not set - -# -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -# CONFIG_STRIP is not set -# CONFIG_WAVELAN is not set -# CONFIG_ARLAN is not set -# CONFIG_AIRONET4500 is not set -# CONFIG_AIRONET4500_NONCS is not set -# CONFIG_AIRONET4500_PROC is not set -# CONFIG_AIRO is not set -# CONFIG_HERMES is not set -# CONFIG_PLX_HERMES is not set -# CONFIG_PCI_HERMES is not set -CONFIG_NET_WIRELESS=y - -# -# Token Ring devices -# -# CONFIG_TR is not set -# CONFIG_NET_FC is not set -# CONFIG_RCPCI is not set -# CONFIG_SHAPER is not set - -# -# Wan interfaces -# -# CONFIG_WAN is not set - -# -# Amateur Radio support -# -# CONFIG_HAMRADIO is not set - -# -# IrDA (infrared) support -# -# CONFIG_IRDA is not set - -# -# ATA/ATAPI/MFM/RLL support -# -# CONFIG_IDE is not set -# CONFIG_BLK_DEV_IDE_MODES is not set -# CONFIG_BLK_DEV_HD is not set - -# -# SCSI support -# -CONFIG_SCSI=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -CONFIG_SD_EXTRA_DEVS=40 -CONFIG_CHR_DEV_ST=m -# CONFIG_CHR_DEV_OSST is not set -CONFIG_BLK_DEV_SR=m -# CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_SR_EXTRA_DEVS=2 -# CONFIG_CHR_DEV_SG is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -# CONFIG_SCSI_DEBUG_QUEUES is not set -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set - -# -# SCSI low-level drivers -# -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_SCSI_7000FASST is not set -# CONFIG_SCSI_ACARD is not set -# CONFIG_SCSI_AHA152X is not set -# CONFIG_SCSI_AHA1542 is not set -# CONFIG_SCSI_AHA1740 is not set -# CONFIG_SCSI_AACRAID is not set -# CONFIG_SCSI_AIC7XXX is not set -# CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_AIC7XXX_OLD is not set -# CONFIG_SCSI_DPT_I2O is not set -# CONFIG_SCSI_ADVANSYS is not set -# CONFIG_SCSI_IN2000 is not set -# CONFIG_SCSI_AM53C974 is not set -# CONFIG_SCSI_MEGARAID is not set -# CONFIG_SCSI_BUSLOGIC is not set -# CONFIG_SCSI_CPQFCTS is not set -# CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_DTC3280 is not set -# CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_EATA_DMA is not set -# CONFIG_SCSI_EATA_PIO is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set -# CONFIG_SCSI_GDTH is not set -# CONFIG_SCSI_GENERIC_NCR5380 is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_NCR53C406A is not set -# CONFIG_SCSI_NCR53C7xx is not set -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_NCR53C8XX is not set -# CONFIG_SCSI_SYM53C8XX is not set -# CONFIG_SCSI_PAS16 is not set -# CONFIG_SCSI_PCI2000 is not set -# CONFIG_SCSI_PCI2220I is not set -# CONFIG_SCSI_PSI240I is not set -# CONFIG_SCSI_QLOGIC_FAS is not set -# CONFIG_SCSI_QLOGIC_ISP is not set -# CONFIG_SCSI_QLOGIC_FC is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_SIM710 is not set -# CONFIG_SCSI_SYM53C416 is not set -# CONFIG_SCSI_DC390T is not set -# CONFIG_SCSI_T128 is not set -# CONFIG_SCSI_U14_34F is not set -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_DEBUG is not set - -# -# IEEE 1394 (FireWire) support (EXPERIMENTAL) -# -# CONFIG_IEEE1394 is not set - -# -# I2O device support -# -# CONFIG_I2O is not set -# CONFIG_I2O_PCI is not set -# CONFIG_I2O_BLOCK is not set -# CONFIG_I2O_LAN is not set -# CONFIG_I2O_SCSI is not set -# CONFIG_I2O_PROC is not set - -# -# ISDN subsystem -# -# CONFIG_ISDN is not set - -# -# Input core support -# -CONFIG_INPUT=m -# CONFIG_INPUT_KEYBDEV is not set -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_JOYDEV is not set -CONFIG_INPUT_EVDEV=m - -# -# Character devices -# -# CONFIG_LEDMAN is not set -# CONFIG_DS1302 is not set -# CONFIG_VT is not set -CONFIG_SERIAL=y -CONFIG_SERIAL_CONSOLE=y -# CONFIG_SERIAL_EXTENDED is not set -# CONFIG_SERIAL_NONSTANDARD is not set -CONFIG_UNIX98_PTYS=y -CONFIG_UNIX98_PTY_COUNT=256 - -# -# I2C support -# -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -# CONFIG_I2C_PHILIPSPAR is not set -# CONFIG_I2C_ELV is not set -# CONFIG_I2C_VELLEMAN is not set -# CONFIG_I2C_MCF_GPIO is not set -CONFIG_I2C_IXP425=y -# CONFIG_SCx200_I2C is not set -# CONFIG_SCx200_ACB is not set -# CONFIG_I2C_ALGOPCF is not set -CONFIG_I2C_CHARDEV=y -# CONFIG_I2C_PROC is not set - -# -# Mice -# -# CONFIG_BUSMOUSE is not set -CONFIG_MOUSE=y -CONFIG_PSMOUSE=y -# CONFIG_82C710_MOUSE is not set -# CONFIG_PC110_PAD is not set -# CONFIG_MK712_MOUSE is not set - -# -# Joysticks -# -# CONFIG_INPUT_GAMEPORT is not set - -# -# Input core support is needed for gameports -# - -# -# Input core support is needed for joysticks -# -# CONFIG_QIC02_TAPE is not set -# CONFIG_IPMI_HANDLER is not set -# CONFIG_IPMI_PANIC_EVENT is not set -# CONFIG_IPMI_DEVICE_INTERFACE is not set -# CONFIG_IPMI_KCS is not set -# CONFIG_IPMI_WATCHDOG is not set - -# -# Controller Area Network Cards/Chips -# -# CONFIG_CAN4LINUX is not set - -# -# Watchdog Cards -# -# CONFIG_WATCHDOG is not set -# CONFIG_SCx200_GPIO is not set -# CONFIG_AMD_PM768 is not set -# CONFIG_NVRAM is not set -# CONFIG_RTC is not set -CONFIG_X1226_RTC=m -# CONFIG_DTLK is not set -# CONFIG_R3964 is not set -# CONFIG_APPLICOM is not set - -# -# Ftape, the floppy tape device driver -# -# CONFIG_FTAPE is not set -# CONFIG_AGP is not set -# CONFIG_DRM is not set - -# -# Multimedia devices -# -CONFIG_VIDEO_DEV=m - -# -# Video For Linux -# -# CONFIG_VIDEO_PROC_FS is not set -# CONFIG_I2C_PARPORT is not set - -# -# Video Adapters -# -# CONFIG_VIDEO_BT848 is not set -# CONFIG_VIDEO_PMS is not set -# CONFIG_VIDEO_CPIA is not set -# CONFIG_VIDEO_SAA5249 is not set -# CONFIG_TUNER_3036 is not set -# CONFIG_VIDEO_STRADIS is not set -# CONFIG_VIDEO_ZORAN is not set -# CONFIG_VIDEO_ZORAN_BUZ is not set -# CONFIG_VIDEO_ZORAN_DC10 is not set -# CONFIG_VIDEO_ZORAN_LML33 is not set -# CONFIG_VIDEO_ZR36120 is not set -# CONFIG_VIDEO_MEYE is not set - -# -# Radio Adapters -# -# CONFIG_RADIO_GEMTEK_PCI is not set -# CONFIG_RADIO_MAXIRADIO is not set -# CONFIG_RADIO_MAESTRO is not set -# CONFIG_RADIO_MIROPCM20 is not set - -# -# File systems -# -CONFIG_QUOTA=y -CONFIG_QFMT_V2=y -# CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set -# CONFIG_REISERFS_FS is not set -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_ADFS_FS is not set -# CONFIG_ADFS_FS_RW is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BEFS_DEBUG is not set -# CONFIG_BFS_FS is not set -CONFIG_EXT3_FS=y -CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set -CONFIG_FAT_FS=y -# CONFIG_MSDOS_FS is not set -# CONFIG_UMSDOS_FS is not set -CONFIG_VFAT_FS=y -# CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_DEBUG=0 -# CONFIG_CRAMFS is not set -CONFIG_TMPFS=y -CONFIG_RAMFS=y -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -# CONFIG_ZISOFS is not set -# CONFIG_JFS_FS is not set -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_NTFS_FS is not set -# CONFIG_NTFS_RW is not set -# CONFIG_HPFS_FS is not set -CONFIG_PROC_FS=y -CONFIG_DEVFS_FS=y -# CONFIG_DEVFS_MOUNT is not set -# CONFIG_DEVFS_DEBUG is not set -CONFIG_DEVPTS_FS=y -# CONFIG_QNX4FS_FS is not set -# CONFIG_QNX4FS_RW is not set -# CONFIG_ROMFS_FS is not set -CONFIG_EXT2_FS=y -# CONFIG_SYSV_FS is not set -# CONFIG_UDF_FS is not set -# CONFIG_UDF_RW is not set -# CONFIG_UFS_FS is not set -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_XFS_FS is not set -# CONFIG_XFS_POSIX_ACL is not set -# CONFIG_XFS_RT is not set -# CONFIG_XFS_QUOTA is not set -# CONFIG_XFS_DMAPI is not set -# CONFIG_XFS_TRACE is not set -# CONFIG_XFS_DEBUG is not set - -# -# Network File Systems -# -# CONFIG_CODA_FS is not set -# CONFIG_INTERMEZZO_FS is not set -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_DIRECTIO=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_TCP=y -CONFIG_SUNRPC=y -CONFIG_LOCKD=y -CONFIG_LOCKD_V4=y -CONFIG_SMB_FS=y -# CONFIG_SMB_NLS_DEFAULT is not set -# CONFIG_NCP_FS is not set -# CONFIG_NCPFS_PACKET_SIGNING is not set -# CONFIG_NCPFS_IOCTL_LOCKING is not set -# CONFIG_NCPFS_STRONG is not set -# CONFIG_NCPFS_NFS_NS is not set -# CONFIG_NCPFS_OS2_NS is not set -# CONFIG_NCPFS_SMALLDOS is not set -# CONFIG_NCPFS_NLS is not set -# CONFIG_NCPFS_EXTRAS is not set -# CONFIG_ZISOFS_FS is not set -# CONFIG_COREDUMP_PRINTK is not set - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -CONFIG_OSF_PARTITION=y -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set -CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -# CONFIG_LDM_PARTITION is not set -CONFIG_SGI_PARTITION=y -# CONFIG_ULTRIX_PARTITION is not set -CONFIG_SUN_PARTITION=y -# CONFIG_EFI_PARTITION is not set -CONFIG_SMB_NLS=y -CONFIG_NLS=y - -# -# Native Language Support -# -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=m -# CONFIG_NLS_CODEPAGE_775 is not set -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=m -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -CONFIG_NLS_CODEPAGE_861=m -# 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=m -# CONFIG_NLS_CODEPAGE_869 is not set -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set - -# -# Sound -# -CONFIG_SOUND=m -# CONFIG_SOUND_ALI5455 is not set -# CONFIG_SOUND_BT878 is not set -# CONFIG_SOUND_CMPCI is not set -# CONFIG_SOUND_EMU10K1 is not set -# CONFIG_MIDI_EMU10K1 is not set -# CONFIG_SOUND_FUSION is not set -# CONFIG_SOUND_CS4281 is not set -# CONFIG_SOUND_ES1370 is not set -# CONFIG_SOUND_ES1371 is not set -# CONFIG_SOUND_ESSSOLO1 is not set -# CONFIG_SOUND_MAESTRO is not set -# CONFIG_SOUND_MAESTRO3 is not set -# CONFIG_SOUND_FORTE is not set -# CONFIG_SOUND_ICH is not set -# CONFIG_SOUND_RME96XX is not set -# CONFIG_SOUND_SONICVIBES is not set -# CONFIG_SOUND_TRIDENT is not set -# CONFIG_SOUND_MSNDCLAS is not set -# CONFIG_SOUND_MSNDPIN is not set -# CONFIG_SOUND_VIA82CXXX is not set -# CONFIG_MIDI_VIA82CXXX is not set -# CONFIG_SOUND_OSS is not set -# CONFIG_SOUND_TVMIXER is not set - -# -# Misc devices -# - -# -# USB support -# -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_UHCI=y -# CONFIG_USB_UHCI_ALT is not set -CONFIG_USB_OHCI=y -# CONFIG_USB_SL811HS_ALT is not set -# CONFIG_USB_SL811HS is not set - -# -# USB Device Class drivers -# -CONFIG_USB_AUDIO=m -# CONFIG_USB_EMI26 is not set - -# -# USB Bluetooth can only be used with disabled Bluetooth subsystem -# -CONFIG_USB_MIDI=m -CONFIG_USB_STORAGE=y -# CONFIG_USB_STORAGE_DEBUG is not set -# CONFIG_HOTPLUG_SCSIDEV_NUMBER is not set -CONFIG_USB_STORAGE_MAXTOR_ONETOUCH=y -CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_DEBUG=y -# CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_USB_EVENT is not set -CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_PERSO=y -CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_PERSO_APP_PATH="/sbin/onetouch" -# CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE_DPCM is not set -# CONFIG_USB_STORAGE_HP8200e is not set -# CONFIG_USB_STORAGE_SDDR09 is not set -# CONFIG_USB_STORAGE_SDDR55 is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_ACM is not set -CONFIG_USB_PRINTER=m - -# -# USB Human Interface Devices (HID) -# -CONFIG_USB_HID=m - -# -# Input core support is needed for USB HID input layer or HIDBP support -# -CONFIG_USB_HIDINPUT=y -CONFIG_USB_HIDDEV=y -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_KBTAB is not set -# CONFIG_USB_POWERMATE is not set - -# -# USB Imaging devices -# -# CONFIG_USB_DC2XX is not set -# CONFIG_USB_MDC800 is not set -CONFIG_USB_SCANNER=m -# CONFIG_USB_MICROTEK is not set -# CONFIG_USB_HPUSBSCSI is not set - -# -# USB Multimedia devices -# -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -CONFIG_USB_OV511=m -CONFIG_USB_PWC=m -# CONFIG_USB_SE401 is not set -# CONFIG_USB_STV680 is not set -# CONFIG_USB_W9968CF is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_DSBR is not set -# CONFIG_USB_DABUSB is not set - -# -# USB Network adaptors -# -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_KAWETH=m -CONFIG_USB_CATC=m -CONFIG_USB_AX8817X=m -CONFIG_USB_CDCETHER=m -CONFIG_USB_USBNET=m - -# -# USB port drivers -# -# CONFIG_USB_USS720 is not set - -# -# USB Serial Converter support -# -CONFIG_USB_SERIAL=m -# CONFIG_USB_SERIAL_DEBUG is not set -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_BELKIN=m -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -# CONFIG_USB_SERIAL_EMPEG is not set -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -CONFIG_USB_SERIAL_KEYSPAN=m -# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set -# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set -CONFIG_USB_SERIAL_MCT_U232=m -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -CONFIG_USB_SERIAL_PL2303=m -# CONFIG_USB_SERIAL_CYBERJACK is not set -# CONFIG_USB_SERIAL_XIRCOM is not set -# CONFIG_USB_SERIAL_OMNINET is not set - -# -# USB Miscellaneous drivers -# -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_AUERSWALD is not set -# CONFIG_USB_TIGL is not set -# CONFIG_USB_BRLVGER is not set -# CONFIG_USB_LCD is not set - -# -# Bluetooth support -# -CONFIG_BLUEZ=m -CONFIG_BLUEZ_L2CAP=m -# CONFIG_BLUEZ_SCO is not set -CONFIG_BLUEZ_RFCOMM=m -# CONFIG_BLUEZ_RFCOMM_TTY is not set -CONFIG_BLUEZ_BNEP=m -CONFIG_BLUEZ_BNEP_MC_FILTER=y -CONFIG_BLUEZ_BNEP_PROTO_FILTER=y - -# -# Bluetooth device drivers -# -CONFIG_BLUEZ_HCIUSB=m -# CONFIG_BLUEZ_USB_SCO is not set -# CONFIG_BLUEZ_USB_ZERO_PACKET is not set -# CONFIG_BLUEZ_HCIUART is not set -# CONFIG_BLUEZ_HCIBFUSB is not set -# CONFIG_BLUEZ_HCIDTL1 is not set -# CONFIG_BLUEZ_HCIBT3C is not set -# CONFIG_BLUEZ_HCIBLUECARD is not set -# CONFIG_BLUEZ_HCIBTUART is not set -# CONFIG_BLUEZ_HCIVHCI is not set - -# -# Kernel hacking -# -CONFIG_FRAME_POINTER=y -# CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_INFO is not set -# CONFIG_NO_PGT_CACHE is not set -# CONFIG_DEBUG_KERNEL is not set -# CONFIG_DEBUG_SLAB is not set -# CONFIG_MAGIC_SYSRQ is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_WAITQ is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_DEBUG_ERRORS is not set -# CONFIG_DEBUG_LL is not set -# CONFIG_DEBUG_DC21285_PORT is not set -# CONFIG_DEBUG_CLPS711X_UART2 is not set - -# -# Cryptographic options -# -# CONFIG_CRYPTO is not set - -# -# Library routines -# -CONFIG_CRC32=y -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y diff --git a/recipes/linux/unslung-kernel/double_cpdo.patch b/recipes/linux/unslung-kernel/double_cpdo.patch deleted file mode 100644 index 4069358db8..0000000000 --- a/recipes/linux/unslung-kernel/double_cpdo.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- linux-2.6.9-rc3-ds1.commit/arch/arm/nwfpe/double_cpdo.c 2004-08-14 07:36:11.000000000 +0200 -+++ linux-2.6.9-rc3-ds1.snap/arch/arm/nwfpe/double_cpdo.c 2004-10-10 20:29:15.514512796 +0200 -@@ -75,7 +75,11 @@ - union float64_components u; - - u.f64 = rFm; -+#ifdef __ARMEB__ -+ u.i[0] ^= 0x80000000; -+#else - u.i[1] ^= 0x80000000; -+#endif - - return u.f64; - } -@@ -85,7 +89,11 @@ - union float64_components u; - - u.f64 = rFm; -+#ifdef __ARMEB__ -+ u.i[0] &= 0x7fffffff; -+#else - u.i[1] &= 0x7fffffff; -+#endif - - return u.f64; - } - diff --git a/recipes/linux/unslung-kernel/flash-is-now-hdd.patch b/recipes/linux/unslung-kernel/flash-is-now-hdd.patch deleted file mode 100644 index cf7352672f..0000000000 --- a/recipes/linux/unslung-kernel/flash-is-now-hdd.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- linux-2.4.22/drivers/scsi/sd.c~ 2005-12-13 06:04:08.000000000 +1030 -+++ linux-2.4.22/drivers/scsi/sd.c 2005-12-13 10:08:13.912932696 +1030 -@@ -1087,6 +1087,7 @@ - rscsi_disks[i].capacity >>= 1; - } - // add by super, moified by pete -+#if 0 - if (rscsi_disks[i].device->removable){ - if(0x32 == rscsi_disks[i].device->host->hostt->port){ - printk("is removable disk \n"); -@@ -1113,6 +1114,7 @@ - ); - } - }else { -+#endif - printk("%x port connect!!!!!\n",rscsi_disks[i].device->host->hostt->port); - if(0x32 == rscsi_disks[i].device->host->hostt->port){ - *IXP425_GPIO_GPOUTR &= 0xfffb; -@@ -1133,7 +1135,9 @@ - NULL - ); - } -+#if 0 - } -+#endif - //end - - -@@ -1682,22 +1686,28 @@ - port2_attached = 0; - if(port2_attached == 0) - *IXP425_GPIO_GPOUTR |= 0x8; -+#if 0 - if(SDp->removable == 1){ - sprintf(flash, "flash_sd%c", 'a' + i); - remove_proc_entry(flash, NULL); - remove_proc_entry(media, NULL); - }else{ -+#endif - sprintf(hdd, "hdd_sd%c", 'a' + i); - remove_proc_entry(hdd,NULL); - remove_proc_entry(media, NULL); -+#if 0 - } -+#endif - break; - case 0x32: - *IXP425_GPIO_GPOUTR |= 0x4; -+#if 0 - if(SDp->removable == 1){ - remove_proc_entry("flash_sda",NULL); - } - else -+#endif - remove_proc_entry("hdd_sda",NULL); - break; - default: diff --git a/recipes/linux/unslung-kernel/gcc-registerparanoia.patch b/recipes/linux/unslung-kernel/gcc-registerparanoia.patch deleted file mode 100644 index 7c3e538e1e..0000000000 --- a/recipes/linux/unslung-kernel/gcc-registerparanoia.patch +++ /dev/null @@ -1,57 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.4.22/include/asm-arm/system.h~gcc-registerparanoia 2004-09-08 19:45:34.000000000 -0500 -+++ linux-2.4.22/include/asm-arm/system.h 2004-09-08 19:53:01.000000000 -0500 -@@ -3,6 +3,15 @@ - - #ifdef __KERNEL__ - -+/* -+ * This is used to ensure the compiler did actually allocate the register we -+ * asked it for some inline assembly sequences. Apparently we can't trust -+ * the compiler from one version to another so a bit of paranoia won't hurt. -+ * This string is meant to be concatenated with the inline asm string and -+ * will cause compilation to stop on mismatch. -+ */ -+#define __asmeq(x, y) ".ifnc " x "," y " ; .err ; .endif\n\t" -+ - #include <linux/config.h> - #include <linux/kernel.h> - ---- linux-2.4.22/include/asm-arm/uaccess.h~gcc-registerparanoia 2004-09-08 19:45:34.000000000 -0500 -+++ linux-2.4.22/include/asm-arm/uaccess.h 2004-09-08 19:59:20.000000000 -0500 -@@ -6,6 +6,7 @@ - */ - #include <linux/sched.h> - #include <asm/errno.h> -+#include <asm/system.h> - - #define VERIFY_READ 0 - #define VERIFY_WRITE 1 -@@ -71,7 +72,9 @@ - extern int __get_user_bad(void); - - #define __get_user_x(__r1,__p,__e,__s,__i...) \ -- __asm__ __volatile__ ("bl __get_user_" #__s \ -+ __asm__ __volatile__ ( \ -+ __asmeq("%0", "r0") __asmeq("%1", "r1") \ -+ "bl __get_user_" #__s \ - : "=&r" (__e), "=r" (__r1) \ - : "0" (__p) \ - : __i) -@@ -110,7 +113,9 @@ - extern int __put_user_bad(void); - - #define __put_user_x(__r1,__p,__e,__s,__i...) \ -- __asm__ __volatile__ ("bl __put_user_" #__s \ -+ __asm__ __volatile__ ( \ -+ __asmeq("%0", "r0") __asmeq("%2", "r1") \ -+ "bl __put_user_" #__s \ - : "=&r" (__e) \ - : "0" (__p), "r" (__r1) \ - : __i) ---- linux-2.4.22/-~gcc-registerparanoia -+++ linux-2.4.22/- diff --git a/recipes/linux/unslung-kernel/gcc3-userfuncs.patch b/recipes/linux/unslung-kernel/gcc3-userfuncs.patch deleted file mode 100644 index 54726bf740..0000000000 --- a/recipes/linux/unslung-kernel/gcc3-userfuncs.patch +++ /dev/null @@ -1,134 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.4.22/arch/arm/lib/getuser.S~gcc3-userfuncs 2004-09-08 19:14:05.000000000 -0500 -+++ linux-2.4.22/arch/arm/lib/getuser.S 2004-09-08 19:49:27.000000000 -0500 -@@ -42,17 +42,17 @@ - - .global __get_user_2 - __get_user_2: -- bic r2, sp, #0x1f00 -- bic r2, r2, #0x00ff -- ldr r2, [r2, #TSK_ADDR_LIMIT] -- sub r2, r2, #2 -- cmp r0, r2 -+ bic ip, sp, #0x1f00 -+ bic ip, ip, #0x00ff -+ ldr ip, [ip, #TSK_ADDR_LIMIT] -+ sub ip, ip, #2 -+ cmp r0, ip - 2: ldrlsbt r1, [r0], #1 --3: ldrlsbt r2, [r0] -+3: ldrlsbt ip, [r0] - #ifndef __ARMEB__ -- orrls r1, r1, r2, lsl #8 -+ orrls r1, r1, ip, lsl #8 - #else -- orrls r1, r2, r1, lsl #8 -+ orrls r1, ip, r1, lsl #8 - #endif - movls r0, #0 - movls pc, lr ---- linux-2.4.22/arch/arm/lib/putuser.S~gcc3-userfuncs 2004-09-08 19:14:05.000000000 -0500 -+++ linux-2.4.22/arch/arm/lib/putuser.S 2004-09-08 19:45:00.000000000 -0500 -@@ -18,7 +18,7 @@ - * Inputs: r0 contains the address - * r1, r2 contains the value - * Outputs: r0 is the error code -- * lr corrupted -+ * ip, lr corrupted - * - * No other registers must be altered. (see include/asm-arm/uaccess.h - * for specific ASM register usage). -@@ -30,11 +30,11 @@ - - .global __put_user_1 - __put_user_1: -- bic r2, sp, #0x1f00 -- bic r2, r2, #0x00ff -- ldr r2, [r2, #TSK_ADDR_LIMIT] -- sub r2, r2, #1 -- cmp r0, r2 -+ bic ip, sp, #0x1f00 -+ bic ip, ip, #0x00ff -+ ldr ip, [ip, #TSK_ADDR_LIMIT] -+ sub ip, ip, #1 -+ cmp r0, ip - 1: strlsbt r1, [r0] - movls r0, #0 - movls pc, lr -@@ -42,20 +42,20 @@ - - .global __put_user_2 - __put_user_2: -- bic r2, sp, #0x1f00 -- bic r2, r2, #0x00ff -- ldr r2, [r2, #TSK_ADDR_LIMIT] -- sub r2, r2, #2 -- cmp r0, r2 -+ bic ip, sp, #0x1f00 -+ bic ip, ip, #0x00ff -+ ldr ip, [ip, #TSK_ADDR_LIMIT] -+ sub ip, ip, #2 -+ cmp r0, ip - #ifndef __ARMEB__ - 2: strlsbt r1, [r0], #1 - movls r1, r1, lsr #8 - 3: strlsbt r1, [r0] - #else --2: movls r2, r1 -+2: movls ip, r1 - movls r1, r1, lsr #8 - strlsbt r1, [r0], #1 -- movls r1, r2 -+ movls r1, ip - 3: strlsbt r1, [r0] - #endif - movls r0, #0 -@@ -64,11 +64,11 @@ - - .global __put_user_4 - __put_user_4: -- bic r2, sp, #0x1f00 -- bic r2, r2, #0x00ff -- ldr r2, [r2, #TSK_ADDR_LIMIT] -- sub r2, r2, #4 -- cmp r0, r2 -+ bic ip, sp, #0x1f00 -+ bic ip, ip, #0x00ff -+ ldr ip, [ip, #TSK_ADDR_LIMIT] -+ sub ip, ip, #4 -+ cmp r0, ip - 4: strlst r1, [r0] - movls r0, #0 - movls pc, lr ---- linux-2.4.22/include/asm-arm/uaccess.h~gcc3-userfuncs 2004-09-08 19:36:03.000000000 -0500 -+++ linux-2.4.22/include/asm-arm/uaccess.h 2004-09-08 20:03:34.000000000 -0500 -@@ -86,7 +86,7 @@ - __get_user_x(__r1, __p, __e, 1, "lr"); \ - break; \ - case 2: \ -- __get_user_x(__r1, __p, __e, 2, "r2", "lr"); \ -+ __get_user_x(__r1, __p, __e, 2, "ip", "lr"); \ - break; \ - case 4: \ - __get_user_x(__r1, __p, __e, 4, "lr"); \ -@@ -122,13 +122,13 @@ - register int __e asm("r0"); \ - switch (sizeof(*(p))) { \ - case 1: \ -- __put_user_x(__r1, __p, __e, 1, "r2", "lr"); \ -+ __put_user_x(__r1, __p, __e, 1, "ip", "lr"); \ - break; \ - case 2: \ -- __put_user_x(__r1, __p, __e, 2, "r2", "lr"); \ -+ __put_user_x(__r1, __p, __e, 2, "ip", "lr"); \ - break; \ - case 4: \ -- __put_user_x(__r1, __p, __e, 4, "r2", "lr"); \ -+ __put_user_x(__r1, __p, __e, 4, "ip", "lr"); \ - break; \ - case 8: \ - __put_user_x(__r1, __p, __e, 8, "ip", "lr"); \ diff --git a/recipes/linux/unslung-kernel/gl811e.patch b/recipes/linux/unslung-kernel/gl811e.patch deleted file mode 100644 index 106c329b4c..0000000000 --- a/recipes/linux/unslung-kernel/gl811e.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- linux-2.4.22/drivers/usb/storage/transport.c Fri Jul 9 10:56:27 2004 -+++ linux-2.4.22/drivers/usb/storage/transport.c Fri Jul 9 11:51:14 2004 -@@ -1170,6 +1170,12 @@ - - /* if the command transfered well, then we go to the data stage */ - if (result == 0) { -+ -+ /* Genesys Logic interface chips need a 100us delay between -+ * the command phase and the data phase */ -+ if (us->pusb_dev->descriptor.idVendor == USB_VENDOR_ID_GENESYS) -+ udelay(100); -+ - /* send/receive data payload, if there is any */ - if (bcb->DataTransferLength) { - usb_stor_transfer(srb, us); ---- linux-2.4.22/drivers/usb/storage/usb.c Fri Jul 9 11:44:53 2004 -+++ linux-2.4.22/drivers/usb/storage/usb.c Fri Jul 9 11:49:44 2004 -@@ -996,6 +996,15 @@ - */ - (struct us_data *)ss->htmplt.proc_dir = ss; - -+ /* According to the technical support people at Genesys Logic, -+ * devices using their chips have problems transferring more -+ * than 32 KB at a time. In practice people have found that -+ * 64 KB works okay and that's what Windows does. But we'll -+ * be conservative. -+ */ -+ if (ss->pusb_dev->descriptor.idVendor == USB_VENDOR_ID_GENESYS) -+ ss->htmplt.max_sectors = 64; -+ - /* Just before we start our control thread, initialize - * the device if it needs initialization */ - if (unusual_dev && unusual_dev->initFunction) ---- linux-2.4.22/drivers/usb/storage/usb.h Fri Jul 9 10:56:03 2004 -+++ linux-2.4.22/drivers/usb/storage/usb.h Fri Jul 9 11:45:49 2004 -@@ -193,4 +193,7 @@ - /* Function to fill an inquiry response. See usb.c for details */ - extern void fill_inquiry_response(struct us_data *us, - unsigned char *data, unsigned int data_len); -+ -+/* Vendor ID list for devices that require special handling */ -+#define USB_VENDOR_ID_GENESYS 0x05e3 /* Genesys Logic */ - #endif diff --git a/recipes/linux/unslung-kernel/linux-2.4.24-attribute-used.patch b/recipes/linux/unslung-kernel/linux-2.4.24-attribute-used.patch deleted file mode 100644 index bcf1c10335..0000000000 --- a/recipes/linux/unslung-kernel/linux-2.4.24-attribute-used.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -purN linux-2.4.24-uc0.orig/include/asm-arm/setup.h linux-2.4.24-uc0/include/asm-arm/setup.h ---- linux-2.4.24-uc0.orig/include/asm-arm/setup.h 2003-08-25 04:44:43.000000000 -0700 -+++ linux-2.4.24-uc0/include/asm-arm/setup.h 2004-09-09 04:36:03.000000000 -0700 -@@ -236,7 +236,7 @@ struct tagtable { - int (*parse)(const struct tag *); - }; - --#define __tag __attribute__((unused, __section__(".taglist"))) -+#define __tag __attribute_used__ __attribute__((__section__(".taglist"))) - #define __tagtable(tag, fn) \ - static struct tagtable __tagtable_##fn __tag = { tag, fn } - -diff -purN linux-2.4.24-uc0.orig/include/linux/compiler.h linux-2.4.24-uc0/include/linux/compiler.h ---- linux-2.4.24-uc0.orig/include/linux/compiler.h 2004-03-31 21:52:49.000000000 -0800 -+++ linux-2.4.24-uc0/include/linux/compiler.h 2004-09-09 01:33:29.000000000 -0700 -@@ -13,4 +13,18 @@ - #define likely(x) __builtin_expect((x),1) - #define unlikely(x) __builtin_expect((x),0) - -+#if __GNUC__ > 3 -+#define __attribute_used__ __attribute__((__used__)) -+#elif __GNUC__ == 3 -+#if __GNUC_MINOR__ >= 3 -+# define __attribute_used__ __attribute__((__used__)) -+#else -+# define __attribute_used__ __attribute__((__unused__)) -+#endif /* __GNUC_MINOR__ >= 3 */ -+#elif __GNUC__ == 2 -+#define __attribute_used__ __attribute__((__unused__)) -+#else -+#define __attribute_used__ /* not implemented */ -+#endif /* __GNUC__ */ -+ - #endif /* __LINUX_COMPILER_H */ -diff -purN linux-2.4.24-uc0.orig/include/linux/init.h linux-2.4.24-uc0/include/linux/init.h ---- linux-2.4.24-uc0.orig/include/linux/init.h 2004-03-31 21:52:50.000000000 -0800 -+++ linux-2.4.24-uc0/include/linux/init.h 2004-09-09 01:38:11.000000000 -0700 -@@ -2,6 +2,7 @@ - #define _LINUX_INIT_H - - #include <linux/config.h> -+#include <linux/compiler.h> - - /* These macros are used to mark some functions or - * initialized data (doesn't apply to uninitialized data) -@@ -51,7 +52,7 @@ typedef void (*exitcall_t)(void); - extern initcall_t __initcall_start, __initcall_end; - - #define __initcall(fn) \ -- static initcall_t __initcall_##fn __init_call = fn -+ static initcall_t __initcall_##fn __attribute_used__ __init_call = fn - #define __exitcall(fn) \ - static exitcall_t __exitcall_##fn __exit_call = fn - -@@ -67,7 +68,7 @@ extern struct kernel_param __setup_start - - #define __setup(str, fn) \ - static char __setup_str_##fn[] __initdata = str; \ -- static struct kernel_param __setup_##fn __attribute__((unused)) __initsetup = { __setup_str_##fn, fn } -+ static struct kernel_param __setup_##fn __attribute_used__ __initsetup = { __setup_str_##fn, fn } - - #endif /* __ASSEMBLY__ */ - -@@ -77,16 +78,16 @@ extern struct kernel_param __setup_start - */ - #ifndef NO_TEXT_SECTIONS - #define __init __attribute__ ((__section__ (".text.init"))) --#define __exit __attribute__ ((unused, __section__(".text.exit"))) -+#define __exit __attribute_used__ __attribute__ ((__section__(".text.exit"))) - #else - #define __init --#define __exit __attribute__ ((unused)) -+#define __exit __attribute_used__ - #endif - #define __initdata __attribute__ ((__section__ (".data.init"))) --#define __exitdata __attribute__ ((unused, __section__ (".data.exit"))) --#define __initsetup __attribute__ ((unused,__section__ (".setup.init"))) --#define __init_call __attribute__ ((unused,__section__ (".initcall.init"))) --#define __exit_call __attribute__ ((unused,__section__ (".exitcall.exit"))) -+#define __exitdata __attribute_used__ __attribute__ ((__section__ (".data.exit"))) -+#define __initsetup __attribute_used__ __attribute__ ((__section__ (".setup.init"))) -+#define __init_call __attribute_used__ __attribute__ ((__section__ (".initcall.init"))) -+#define __exit_call __attribute_used__ __attribute__ ((__section__ (".exitcall.exit"))) - - /* For assembly routines */ - #define __INIT .section ".text.init","ax" -diff -purN linux-2.4.24-uc0.orig/include/linux/module.h linux-2.4.24-uc0/include/linux/module.h ---- linux-2.4.24-uc0.orig/include/linux/module.h 2002-08-02 17:39:45.000000000 -0700 -+++ linux-2.4.24-uc0/include/linux/module.h 2004-09-09 03:15:30.000000000 -0700 -@@ -8,6 +8,7 @@ - #define _LINUX_MODULE_H - - #include <linux/config.h> -+#include <linux/compiler.h> - #include <linux/spinlock.h> - #include <linux/list.h> - -@@ -254,9 +255,9 @@ __attribute__((section(".modinfo"))) = - */ - #define MODULE_GENERIC_TABLE(gtype,name) \ - static const unsigned long __module_##gtype##_size \ -- __attribute__ ((unused)) = sizeof(struct gtype##_id); \ -+ __attribute_used__ = sizeof(struct gtype##_id); \ - static const struct gtype##_id * __module_##gtype##_table \ -- __attribute__ ((unused)) = name -+ __attribute_used__ = name - - /* - * The following license idents are currently accepted as indicating free -@@ -284,7 +285,7 @@ static const struct gtype##_id * __modul - */ - - #define MODULE_LICENSE(license) \ --static const char __module_license[] __attribute__((section(".modinfo"))) = \ -+static const char __module_license[] __attribute_used__ __attribute__((section(".modinfo"))) = \ - "license=" license - - /* Define the module variable, and usage macros. */ -@@ -296,10 +297,10 @@ extern struct module __this_module; - #define MOD_IN_USE __MOD_IN_USE(THIS_MODULE) - - #include <linux/version.h> --static const char __module_kernel_version[] __attribute__((section(".modinfo"))) = -+static const char __module_kernel_version[] __attribute_used__ __attribute__((section(".modinfo"))) = - "kernel_version=" UTS_RELEASE; - #ifdef MODVERSIONS --static const char __module_using_checksums[] __attribute__((section(".modinfo"))) = -+static const char __module_using_checksums[] __attribute_used__ __attribute__((section(".modinfo"))) = - "using_checksums=1"; - #endif - -@@ -319,7 +320,7 @@ static const char __module_using_checksu - */ - #define MODULE_GENERIC_TABLE(gtype,name) \ - static const struct gtype##_id * __module_##gtype##_table \ -- __attribute__ ((unused, __section__(".data.exit"))) = name -+ __attribute_used__ __attribute__ ((__section__(".data.exit"))) = name - - #ifndef __GENKSYMS__ - diff --git a/recipes/linux/unslung-kernel/linux-kernel-R25_to_R29.patch b/recipes/linux/unslung-kernel/linux-kernel-R25_to_R29.patch deleted file mode 100644 index 1f627ca66b..0000000000 --- a/recipes/linux/unslung-kernel/linux-kernel-R25_to_R29.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -r -u -x CVS R23/drivers/usb/storage/unusual_devs.h R29/drivers/usb/storage/unusual_devs.h ---- R23/drivers/usb/storage/unusual_devs.h 2004-07-07 08:31:44.000000000 +0100 -+++ R29/drivers/usb/storage/unusual_devs.h 2004-08-30 07:53:58.000000000 +0100 -@@ -1,7 +1,7 @@ - /* Driver for USB Mass Storage compliant devices - * Ununsual Devices File - * -- * $Id: unusual_devs.h,v 1.1 2004/03/24 20:43:17 sure Exp $ -+ * $Id: unusual_devs.h,v 1.2 2004/08/30 06:53:58 sure Exp $ - * - * Current development and maintenance by: - * (c) 2000-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net) -@@ -686,6 +686,17 @@ - "OneTouch", - US_SC_SCSI, US_PR_BULK, mxo_ot_init, - US_FL_SINGLE_LUN), -+UNUSUAL_DEV( 0x0D49, 0x7100, 0x0000, 0x9999, -+ "Maxtor", -+ "OneTouch II", -+ US_SC_SCSI, US_PR_BULK, mxo_ot_init, -+ US_FL_SINGLE_LUN), -+UNUSUAL_DEV( 0x0D49, 0x7110, 0x0000, 0x9999, -+ "Maxtor", -+ "OneTouch II", -+ US_SC_SCSI, US_PR_BULK, mxo_ot_init, -+ US_FL_SINGLE_LUN), -+ - UNUSUAL_DEV( 0x0D49, 0x5000, 0x0000, 0x9999, - "Maxtor", - "5000DV v01.00.00", -diff -r -u -x CVS R23/drivers/usb/storage/usb.c R29/drivers/usb/storage/usb.c ---- R23/drivers/usb/storage/usb.c 2004-07-07 08:31:44.000000000 +0100 -+++ R29/drivers/usb/storage/usb.c 2004-08-30 07:54:48.000000000 +0100 -@@ -1,6 +1,6 @@ - /* Driver for USB Mass Storage compliant devices - * -- * $Id: usb.c,v 1.1 2004/03/24 20:43:17 sure Exp $ -+ * $Id: usb.c,v 1.2 2004/08/30 06:54:48 sure Exp $ - * - * Current development and maintenance by: - * (c) 1999-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net) diff --git a/recipes/linux/unslung-kernel/linux-kernel-R29_to_R63.patch b/recipes/linux/unslung-kernel/linux-kernel-R29_to_R63.patch deleted file mode 100644 index 6882b335f3..0000000000 --- a/recipes/linux/unslung-kernel/linux-kernel-R29_to_R63.patch +++ /dev/null @@ -1,6441 +0,0 @@ ---- linux-2.4.22-r29/drivers/ixp400/Makefile 2005-11-27 21:09:09.000000000 +0100 -+++ linux-2.4.22/drivers/ixp400/Makefile 2005-11-27 21:25:15.000000000 +0100 -@@ -80,9 +80,9 @@ - # -- End Intel/GPL Copyright Notice -- - # - - ifdef CONFIG_IXP425_CSR --include $(ROOTDIR)/IXP400lib/ixp400_xscale_sw/buildUtils/environment.linux -+# include $(ROOTDIR)/IXP400lib/ixp400_xscale_sw/buildUtils/environment.linux - # IX_XSCALE_SW=$(ROOTDIR)/IXP400lib/ixp400_xscale_sw/ - # The kernel makefiles override the value of CFLAGS on the make - # commandline. Because the xscale_sw makefile is supposed to be - # stand-alone, we don't want this. So we reset the special variable -@@ -136,15 +136,15 @@ - # This rule builds the modules. - # The dependency on modversions.h is needed here so it'll be built for - # us in a 'make modules'. - build_ixp400_modules: force $(TOPDIR)/include/linux/modversions.h -- cd $(IX_XSCALE_SW); $(MAKE) IX_NOSYM=1 $(REAL_IXP400_MODULES:$(IX_XSCALE_SW)/%=%) -+# cd $(IX_XSCALE_SW); $(MAKE) IX_NOSYM=1 $(REAL_IXP400_MODULES:$(IX_XSCALE_SW)/%=%) - - # After building the modules, we copy them to this directory as that's - # where the kernel makefiles expect to find them. We can't use - # symlinks, as Jungo's 'make ramdisk' rule would just copy the links. - $(IXP400_MODULES): $(REAL_IXP400_MODULES) -- cp $(IX_XSCALE_SW)/lib/linuxbe/$@ $@ -+# cp $(IX_XSCALE_SW)/lib/linuxbe/$@ $@ - - # This macro is the interface to the rules in $(TOPDIR)/Rules.make. It - # contains the names of all module files that can be built in this - # directory. Note that they must be filenames in this directory - the ---- R29/drivers/Makefile 2004-03-24 19:55:04.000000000 +0000 -+++ R63/drivers/Makefile 2005-08-30 06:06:00.000000000 +0100 -@@ -48,9 +48,4 @@ - subdir-$(CONFIG_PCF8594C2) += i2c/pcf8594c-2 - - subdir-$(CONFIG_BLUEZ) += bluetooth -- --ifdef CONFIG_ARCH_IXP425 --subdir-$(CONFIG_IXP425_CSR) += ixp400 --endif -- - include $(TOPDIR)/Rules.make ---- R29/drivers/net/Makefile 2004-03-24 19:55:20.000000000 +0000 -+++ R63/drivers/net/Makefile 2005-08-23 06:20:03.000000000 +0100 -@@ -28,10 +28,7 @@ - obj-$(CONFIG_OCP_NET) += ibm_emac/ocp.o - - ifdef CONFIG_IXP425_CSR --include $(ROOTDIR)/IXP400lib/ixp400_xscale_sw/buildUtils/environment.linux --CFLAGS_ixp425_eth.o = -I$(IX_XSCALE_SW)/src/linux \ -- -I$(IX_XSCALE_SW)/src/include --obj-m += ixp425_eth.o -+#obj-m += ixp425_eth.o - endif - - ifeq ($(CONFIG_E1000),y) ---- R29/drivers/scsi/hosts.c 2004-03-24 19:55:43.000000000 +0000 -+++ R63/drivers/scsi/hosts.c 2005-04-05 02:40:53.000000000 +0100 -@@ -36,12 +36,15 @@ - #define __KERNEL_SYSCALLS__ - - #include <linux/unistd.h> -- -+//pete -+#include <linux/sched.h> -+#include <linux/completion.h> -+// - #include "scsi.h" - #include "hosts.h" - - /* --static const char RCSid[] = "$Header: /home/cvsroot/NSLU2/linux-2.4.x/drivers/scsi/hosts.c,v 1.1.1.1 2004/03/24 19:55:43 sure Exp $"; -+static const char RCSid[] = "$Header: /home/nas-cvsroot/NSLU2_V2/linux-2.4.x/drivers/scsi/hosts.c,v 1.2 2005/04/05 01:40:53 shearer Exp $"; - */ - - /* -@@ -84,6 +87,12 @@ - int max_scsi_hosts; /* host_no for next new host */ - int next_scsi_host; /* count of registered scsi hosts */ - -+//pete -+extern pid_t sd_mc_thread_pid; -+//extern DECLARE_COMPLETION(scsi_mc_thread_exited); -+extern struct completion sd_mc_thread_exited; -+// -+ - void - scsi_unregister(struct Scsi_Host * sh){ - struct Scsi_Host * shpnt; -@@ -110,6 +119,15 @@ - - next_scsi_host--; - -+ //pete -+ //printk("+++++ scsi_unregister:next_scsi_host:%d\n", next_scsi_host); -+ if( next_scsi_host == 0){ -+ /* Send a signal to exit the thread. */ -+ kill_proc(sd_mc_thread_pid, SIGTERM, 1); -+ /* If no scsi host left, we wait the thread to exit. */ -+ wait_for_completion(&sd_mc_thread_exited); -+ } -+ // - kfree((char *) sh); - } - ---- R29/drivers/scsi/scsi.c 2004-03-24 19:55:45.000000000 +0000 -+++ R63/drivers/scsi/scsi.c 2005-05-31 10:38:52.000000000 +0100 -@@ -84,7 +84,7 @@ - #endif - - /* -- static const char RCSid[] = "$Header: /home/cvsroot/NSLU2/linux-2.4.x/drivers/scsi/scsi.c,v 1.1.1.1 2004/03/24 19:55:45 sure Exp $"; -+ static const char RCSid[] = "$Header: /home/nas-cvsroot/NSLU2_V2/linux-2.4.x/drivers/scsi/scsi.c,v 1.2 2005/05/31 09:38:52 shearer Exp $"; - */ - - /* -@@ -1991,9 +1991,10 @@ - for (shpnt = scsi_hostlist; shpnt; shpnt = shpnt->next) { - for (SDpnt = shpnt->host_queue; SDpnt; SDpnt = SDpnt->next) - if (SDpnt->host->hostt == tpnt) { -- for (sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next) -- if (sdtpnt->attach) -- (*sdtpnt->attach) (SDpnt); -+ for (sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next) -+ if (sdtpnt->attach){ -+ (*sdtpnt->attach) (SDpnt); -+ } - if (SDpnt->attached) { - scsi_build_commandblocks(SDpnt); - if (0 == SDpnt->has_cmdblocks) -@@ -2049,7 +2050,7 @@ - char name[10]; /* host_no>=10^9? I don't think so. */ - - /* get the big kernel lock, so we don't race with open() */ -- lock_kernel();
-+ lock_kernel(); - - /* - * First verify that this host adapter is completely free with no pending ---- R29/drivers/scsi/scsi.h 2004-07-07 09:01:24.000000000 +0100 -+++ R63/drivers/scsi/scsi.h 2005-03-31 05:58:07.000000000 +0100 -@@ -575,6 +575,9 @@ - char type; - char scsi_level; - char vendor[8], model[16], rev[4]; -+ //pete -+ char node[6]; -+ // - unsigned char current_tag; /* current tag */ - unsigned char sync_min_period; /* Not less than this period */ - unsigned char sync_max_offset; /* Not greater than this offset */ ---- R29/drivers/scsi/scsi_proc.c 2004-03-24 19:55:45.000000000 +0000 -+++ R63/drivers/scsi/scsi_proc.c 2004-10-28 09:54:56.000000000 +0100 -@@ -263,8 +263,8 @@ - extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE]; - - y = sprintf(buffer + len, -- "Host: scsi%d Channel: %02d Id: %02d Lun: %02d\n Vendor: ", -- scd->host->host_no, scd->channel, scd->id, scd->lun); -+ "Host: scsi%d-%s Channel: %02d Id: %02d Lun: %02d\n Vendor: ", -+ scd->host->host_no, /*pete*/scd->node, scd->channel, scd->id, scd->lun); - for (x = 0; x < 8; x++) { - if (scd->vendor[x] >= 0x20) - y += sprintf(buffer + len + y, "%c", scd->vendor[x]); ---- linux-2.4.22-r29/drivers/scsi/sd.c 2005-11-27 21:08:49.000000000 +0100 -+++ linux-2.4.22/drivers/scsi/sd.c 2005-11-27 21:15:45.000000000 +0100 -@@ -61,6 +61,10 @@ - - #include <linux/genhd.h> - -+//pete -+#include <linux/completion.h> -+// -+ - /* - * static const char RCSid[] = "$Header:"; - */ -@@ -81,6 +85,9 @@ - #define N_USED_SD_MAJORS (N_USED_SCSI_DISKS / SCSI_DISKS_PER_MAJOR) - - #define MAX_RETRIES 5 -+//pete -+#define SCSI_SEND_CMND_INTERVAL 5*HZ -+// - - /* - * Time out in seconds for disks and Magneto-opticals (which are slower). -@@ -89,11 +96,16 @@ - #define SD_TIMEOUT (30 * HZ) - #define SD_MOD_TIMEOUT (75 * HZ) - -+// - /* grant */ - //#define GUID_EQUAL(x,y) (x[0]==y[0] && x[1]==y[1] && x[2]==y[2]) - -+//pete -+static int port2_attached; -+pid_t sd_mc_thread_pid; -+DECLARE_COMPLETION(sd_mc_thread_exited); -+// - static Scsi_Disk *rscsi_disks; --//static Scsi_Disk *rscsi_disks; - static struct gendisk *sd_gendisks; - static int *sd_sizes; - static int *sd_blocksizes; -@@ -104,7 +116,9 @@ - static int fop_revalidate_scsidisk(kdev_t); - - static int sd_init_onedisk(int); -- -+//pete -+static int sd_send_cmnd_one(int); -+// - - static int sd_init(void); - static void sd_finish(void); -@@ -113,6 +127,7 @@ - static void sd_detach(Scsi_Device *); - static int sd_init_command(Scsi_Cmnd *); - -+ - static struct Scsi_Device_Template sd_template = { - name:"disk", - tag:"sd", -@@ -783,6 +798,11 @@ - unsigned int the_result; - int sector_size; - Scsi_Request *SRpnt; -+ -+ //pete -+ char flash[12]="flash_"; -+ char hdd[10]="hdd_"; -+ // - - /* - * Get the name of the disk, in case we need to log it somewhere. -@@ -1053,6 +1073,7 @@ - "%u %d-byte hdwr sectors (%u MB)\n", - nbuff, rscsi_disks[i].capacity, - hard_sector, (sz - sz/625 + 974)/1950); -+ - } - - /* Rescale capacity to 512-byte units */ -@@ -1065,6 +1086,55 @@ - if (sector_size == 256) - rscsi_disks[i].capacity >>= 1; - } -+ // add by super, moified by pete -+ if (rscsi_disks[i].device->removable){ -+ if(0x32 == rscsi_disks[i].device->host->hostt->port){ -+ printk("is removable disk \n"); -+ *IXP425_GPIO_GPOUTR &= 0xfffb; -+ //port2_attached |= 1<<(i-1); -+ remove_proc_entry("flash_sda",NULL); -+ create_proc_read_entry("flash_sda", -+ 0, -+ NULL, -+ NULL, -+ NULL -+ ); -+ }else{ -+ strcat(flash,nbuff); -+ printk("is removable disk \n"); -+ *IXP425_GPIO_GPOUTR &= 0xfff7; -+ port2_attached |= 1<<(i-1); -+ remove_proc_entry(flash,NULL); -+ create_proc_read_entry(flash, -+ 0, -+ NULL, -+ NULL, -+ NULL -+ ); -+ } -+ }else { -+ printk("%x port connect!!!!!\n",rscsi_disks[i].device->host->hostt->port); -+ if(0x32 == rscsi_disks[i].device->host->hostt->port){ -+ *IXP425_GPIO_GPOUTR &= 0xfffb; -+ create_proc_read_entry("hdd_sda", -+ 0, -+ NULL, -+ NULL, -+ NULL -+ ); -+ }else{ -+ *IXP425_GPIO_GPOUTR &= 0xfff7; -+ port2_attached |= 1<<(i-1); -+ strcat(hdd,nbuff); -+ create_proc_read_entry(hdd, -+ 0, -+ NULL, -+ NULL, -+ NULL -+ ); -+ } -+ } -+ //end - - - /* -@@ -1124,6 +1194,140 @@ - return i; - } - -+//pete -+static int sd_send_cmnd_one(int i) -+{ -+ unsigned char cmd[10]; -+ char nbuff[6]; -+ unsigned char *buffer; -+ unsigned int the_result; -+ Scsi_Request *SRpnt; -+ -+ char media[24]; -+ /* -+ * Get the name of the disk, in case we need to log it somewhere. -+ */ -+ sd_devname(i, nbuff); -+ -+ /* -+ * If the device is offline, don't try and read capacity or any -+ * of the other niceties. -+ */ -+ if (rscsi_disks[i].device->online == FALSE) -+ return i; -+ -+ /* -+ * We need to retry the READ_CAPACITY because a UNIT_ATTENTION is -+ * considered a fatal error, and many devices report such an error -+ * just after a scsi bus reset. -+ */ -+ -+ SRpnt = scsi_allocate_request(rscsi_disks[i].device); -+ if (!SRpnt) { -+ printk(KERN_WARNING "(sd_init_onedisk:) Request allocation failure.\n"); -+ return i; -+ } -+ -+ buffer = (unsigned char *) scsi_malloc(512); -+ if (!buffer) { -+ printk(KERN_WARNING "(sd_init_onedisk:) Memory allocation failure.\n"); -+ scsi_release_request(SRpnt); -+ return i; -+ } -+ -+ cmd[0] = TEST_UNIT_READY; /* use this command to test media change */ -+ cmd[1] = (rscsi_disks[i].device->scsi_level <= SCSI_2) ? -+ ((rscsi_disks[i].device->lun << 5) & 0xe0) : 0; -+ memset((void *) &cmd[2], 0, 8); -+ SRpnt->sr_cmd_len = 0; -+ SRpnt->sr_sense_buffer[0] = 0; -+ SRpnt->sr_sense_buffer[2] = 0; -+ SRpnt->sr_data_direction = SCSI_DATA_NONE; -+ -+ scsi_wait_req (SRpnt, (void *) cmd, (void *) buffer, -+ 0/*512*/, SD_TIMEOUT, MAX_RETRIES); -+ -+ the_result = SRpnt->sr_result; -+ -+ sprintf(media, "sd%c_media_not_present", 'a' + i); -+ -+ /* -- code: 0x70, key: 0x2, ASC: 0x3a, ASCQ: 0x0 -+ this indicates Unit not ready: media not present */ -+ if( the_result != 0 -+ && ((driver_byte(the_result) & DRIVER_SENSE) != 0) -+ && SRpnt->sr_sense_buffer[0] == 0x70 -+ && (SRpnt->sr_sense_buffer[2]& 0xf) == NOT_READY -+ && SRpnt->sr_sense_buffer[12] == 0x3A -+ && SRpnt->sr_sense_buffer[13] == 0x0 ) { -+ //printk("sd%c media not present!\n", 'a' + i); -+ remove_proc_entry(media, NULL); -+ create_proc_read_entry(media, -+ 0, -+ NULL, -+ NULL, -+ NULL -+ ); -+ }else if(the_result == 0){ /* need more conditions? */ -+ remove_proc_entry(media, NULL); -+ } -+ -+ scsi_release_request(SRpnt); -+ SRpnt = NULL; -+ -+ scsi_free(buffer, 512); -+ return i; -+} -+ -+static int sd_send_cmnd_thread(void) -+{ -+ int i; -+ -+ siginitsetinv(¤t->blocked, 0); -+ -+ //lock_kernel(); -+ -+ /* -+ * This thread doesn't need any user-level access, -+ * so get rid of all our resources.. -+ */ -+ exit_files(current); -+ current->files = init_task.files; -+ atomic_inc(¤t->files->count); -+ daemonize(); -+ reparent_to_init(); -+ -+ /* avoid getting signals */ -+ spin_lock_irq(¤t->sigmask_lock); -+ flush_signals(current); -+ sigfillset(¤t->blocked); -+ recalc_sigpending(current); -+ spin_unlock_irq(¤t->sigmask_lock); -+ -+ /* set our name for identification purposes */ -+ sprintf(current->comm, "sd-mc-thread"); -+ -+ //unlock_kernel(); -+ -+ do{ -+ /* If all scsi disks are removed, there will be no scsi host, so we should exit this thread. */ -+ if(next_scsi_host == 0) -+ break; -+ -+ for (i = 0; i < sd_template.dev_max; ++i) -+ if ( rscsi_disks[i].device) { -+ sd_send_cmnd_one(i); -+ } -+ -+ /* Now sleep for 5 seconds */ -+ current->state = TASK_INTERRUPTIBLE; -+ schedule_timeout(SCSI_SEND_CMND_INTERVAL); -+ }while(!signal_pending(current)); -+ -+ complete_and_exit(&sd_mc_thread_exited, 0); -+ return 0; -+} -+// -+ - /* - * The sd_init() function looks at all SCSI drives present, determines - * their size, and reads partition table entries for them. -@@ -1298,6 +1502,15 @@ - : 4; /* 4 sector read-ahead */ - } - -+ //pete -+ //printk("-------------------in sd_finish------------------\n"); -+ if(next_scsi_host == 1){ -+ /* We just need *ONE* thread */ -+ sd_mc_thread_pid = kernel_thread(sd_send_cmnd_thread, NULL, CLONE_VM); -+ if(sd_mc_thread_pid < 0) -+ printk("Unable to start sd send command thread\n"); -+ } -+ // - return; - } - -@@ -1323,9 +1536,26 @@ - SDp->attached--; - return 1; - } -- for (dpnt = rscsi_disks, i = 0; i < sd_template.dev_max; i++, dpnt++) -- if ( SDp == dpnt->device || !dpnt->device) /* grant */ -- break; -+ -+ //Pete -+ if(SDp->host->host_no == 0){ -+ dpnt = rscsi_disks; -+ if(dpnt->device){ -+ SDp->attached--; -+ return 1; -+ } -+ i = 0; -+ } -+ else{ -+ //start from rscsi_disk[1]. -+ dpnt = rscsi_disks; -+ dpnt++; -+ i = 1; -+ for (; i < sd_template.dev_max; i++, dpnt++) -+ if (SDp == dpnt->device||!dpnt->device){ -+ break; -+ } -+ } - - if (i >= sd_template.dev_max) { - printk(KERN_WARNING "scsi_devices corrupt (sd)," -@@ -1334,18 +1564,7 @@ - SDp->attached--; - return 1; - } -- /* check different disks by grant */ -- // i = SDp->removable;//super modify -- printk("the host no is %d\n",SDp->host->host_no); -- i = 1 - SDp->host->host_no; -- if ( rscsi_disks[i].device )//&& -- // !GUID_EQUAL( (struct us_data *)rscsi_disks[i].device->host->hostt->proc_dir->guid, -- // (struct us_data *)SDp->host->hostt->proc_dir->guid) ) -- { -- sd_detach( rscsi_disks[i].device ); -- printk("* sd_detach\n"); -- } -- printk("* sd_attach:%d\n",i); -+ - rscsi_disks[i].device = SDp; - rscsi_disks[i].has_part_table = 0; - sd_template.nr_dev++; -@@ -1355,6 +1574,9 @@ - if (SDp->removable) - SD_GENDISK(i).flags[devnum] |= GENHD_FL_REMOVABLE; - sd_devname(i, nbuff); -+ //pete -+ strcpy(SDp->node, nbuff); -+ // - printk("Attached scsi %sdisk %s at scsi%d, channel %d, id %d, lun %d\n", - SDp->removable ? "removable " : "", - nbuff, SDp->host->host_no, SDp->channel, SDp->id, SDp->lun); -@@ -1434,29 +1656,65 @@ - int i, j; - int max_p; - int start; -+ //pete -+ char flash[12]; -+ char hdd[10]; -+ char media[26]; -+ // - - if (rscsi_disks == NULL) - return; - -+ - for (dpnt = rscsi_disks, i = 0; i < sd_template.dev_max; i++, dpnt++) - if (dpnt->device == SDp) { -+ -+ #if 1 -+ //pete -+ sprintf(media, "sd%c_media_not_present", 'a' + i); -+ -+ switch(SDp->host->hostt->port){ -+ case 0x31: -+ port2_attached ^= 1<<(i-1); -+ if(port2_attached < 0) -+ port2_attached = 0; -+ if(port2_attached == 0) -+ *IXP425_GPIO_GPOUTR |= 0x8; -+ if(SDp->removable == 1){ -+ sprintf(flash, "flash_sd%c", 'a' + i); -+ remove_proc_entry(flash, NULL); -+ remove_proc_entry(media, NULL); -+ }else{ -+ sprintf(hdd, "hdd_sd%c", 'a' + i); -+ remove_proc_entry(hdd,NULL); -+ remove_proc_entry(media, NULL); -+ } -+ break; -+ case 0x32: -+ *IXP425_GPIO_GPOUTR |= 0x4; -+ if(SDp->removable == 1){ -+ remove_proc_entry("flash_sda",NULL); -+ } -+ else -+ remove_proc_entry("hdd_sda",NULL); -+ break; -+ default: -+ break; -+ } -+ #endif -+ // - - /* If we are disconnecting a disk driver, sync and invalidate - * everything */ - sdgd = &SD_GENDISK(i); - max_p = sd_gendisk.max_p; - start = i << sd_gendisk.minor_shift; --printk("max_p is %d ;start is %d\n",max_p,start); -- - for (j = max_p - 1; j >= 0; j--) { - int index = start + j; -- // printk("invalidate_device index = %d\n",index); -- invalidate_device(MKDEV_SD_PARTITION(index), 1); -+ invalidate_device(MKDEV_SD_PARTITION(index), 0); - sdgd->part[SD_MINOR_NUMBER(index)].start_sect = 0; - sdgd->part[SD_MINOR_NUMBER(index)].nr_sects = 0; - sd_sizes[index] = 0; -- // printk("MKDEV_SD_PARTITION ok\n"); -- - } - devfs_register_partitions (sdgd, - SD_MINOR_NUMBER (start), 1); ---- R29/drivers/usb/host/ehci-q.c 2004-07-07 08:31:43.000000000 +0100 -+++ R63/drivers/usb/host/ehci-q.c 2005-02-03 04:59:48.000000000 +0000 -@@ -39,6 +39,22 @@ - */ - - /*-------------------------------------------------------------------------*/ -+
-+//pete -+void ehci_urb_dma_sync(struct usb_hcd *hcd, struct urb *urb) -+{ -+ if (urb->setup_dma) -+ pci_dma_sync_single(hcd->pdev, urb->setup_dma, -+ sizeof(struct usb_ctrlrequest), -+ PCI_DMA_TODEVICE); -+ if (urb->transfer_buffer_length != 0) -+ pci_dma_sync_single(hcd->pdev, urb->transfer_dma, -+ urb->transfer_buffer_length, -+ usb_pipein(urb->pipe) -+ ? PCI_DMA_FROMDEVICE -+ : PCI_DMA_TODEVICE); -+} -+// - - /* fill a qtd, returning how much of the buffer we were able to queue up */ - -@@ -205,7 +221,16 @@ - qh_put (ehci, qh); - } - -+ -+ - spin_lock (&urb->lock); -+ -+//pete: This fix the 2.0hub + 1.1 udisks bug -+ /* only control transfer makes trouble */ -+ if (usb_pipecontrol (urb->pipe)){ -+ ehci_urb_dma_sync(&ehci->hcd, urb); -+ }
-+ - urb->hcpriv = 0; - switch (urb->status) { - case -EINPROGRESS: /* success */ -@@ -799,6 +824,10 @@ - { - struct ehci_qh *qh = 0; - -+ //pete -+ //printk("in qh_append_tds\n"); -+ //show_bytes((unsigned char *)&urb->dev->descriptor, 18); -+ - qh = (struct ehci_qh *) *ptr; - if (unlikely (qh == 0)) { - /* can't sleep here, we have ehci->lock... */ -@@ -903,6 +932,9 @@ - dummy->hw_token = token; - - urb->hcpriv = qh_get (qh); -+ //pete -+ //show_bytes((unsigned char *)&urb->dev->descriptor, 18); -+ //show_bytes((unsigned char *)&dma, 18); - } - } - return qh; ---- R29/drivers/usb/host/usb-uhci.c 2004-03-24 20:42:22.000000000 +0000 -+++ R63/drivers/usb/host/usb-uhci.c 2004-11-11 09:38:55.000000000 +0000 -@@ -16,7 +16,7 @@ - * (C) Copyright 1999 Randy Dunlap - * (C) Copyright 1999 Gregory P. Smith - * -- * $Id: usb-uhci.c,v 1.1 2004/03/24 20:42:22 sure Exp $ -+ * $Id: usb-uhci.c,v 1.3 2004/10/19 03:36:08 pete Exp $ - */ - - #include <linux/config.h> -@@ -53,7 +53,7 @@ - /* This enables an extra UHCI slab for memory debugging */ - #define DEBUG_SLAB - --#define VERSTR "$Revision: 1.1 $ time " __TIME__ " " __DATE__ -+#define VERSTR "$Revision: 1.3 $ time " __TIME__ " " __DATE__ - - #include <linux/usb.h> - #include "usb-uhci.h" -@@ -2330,6 +2330,10 @@ - status stage is completed - */ - -+ //Pete -+ //uhci_urb_dma_sync(s, urb, urb->hcpriv); -+ // -+ - if (urb_priv->flags && - ((qh->hw.qh.element == cpu_to_le32(UHCI_PTR_TERM)) || !is_td_active(desc))) - goto transfer_finished; -@@ -2364,6 +2368,10 @@ - else if ((le32_to_cpu(desc->hw.td.info) & 0xff) != USB_PID_SETUP) - urb->actual_length += actual_length; - -+ //Pete -+ uhci_urb_dma_sync(s, urb, urb->hcpriv); -+ // -+ - // got less data than requested - if ( (actual_length < maxlength)) { - if (urb->transfer_flags & USB_DISABLE_SPD) { ---- R29/drivers/usb/hub.c 2004-03-24 19:55:48.000000000 +0000 -+++ R63/drivers/usb/hub.c 2005-06-02 07:31:32.000000000 +0100 -@@ -726,7 +726,6 @@ - break; - } - -- hub->children[port] = dev; - - /* Reset the device */ - if (usb_hub_port_reset(hub, port, dev, delay)) { -@@ -776,8 +775,11 @@ - } - - /* Run it through the hoops (find a driver, etc) */ -- if (!usb_new_device(dev)) -+ if (!usb_new_device(dev)){ -+ //pete -+ hub->children[port] = dev; - goto done; -+ } - - /* Free the configuration if there was an error */ - usb_free_dev(dev); -@@ -896,9 +898,9 @@ - usb_clear_port_feature(dev, i + 1, USB_PORT_FEAT_C_RESET); - } - // if (portchange&&(!list_empty(&hub_event_list.next))){ -- if (portchange){ -- break;//super -- } -+// if (portchange){ -+// break;//super -+// } - } /* end for i */ - - /* deal with hub status changes */ ---- linux-2.4.22-r29/drivers/usb/storage/transport.c 2005-11-27 21:09:04.000000000 +0100 -+++ linux-2.4.22/drivers/usb/storage/transport.c 2005-11-28 15:56:40.000000000 +0100 -@@ -1,6 +1,6 @@ - /* Driver for USB Mass Storage compliant devices - * -- * $Id: transport.c,v 1.1 2004/03/24 20:43:17 sure Exp $ -+ * $Id: transport.c,v 1.2 2004/09/29 03:56:50 super Exp $ - * - * Current development and maintenance by: - * (c) 1999-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net) -@@ -1244,6 +1244,8 @@ - goto out; - } - -+ udelay(100); /* For GL811E Chip */ -+ - /* if the command transfered well, then we go to the data stage */ - if (result == 0) { - ---- linux-2.4.22-r29/drivers/usb/storage/usb.c 2005-11-27 21:09:04.000000000 +0100 -+++ linux-2.4.22/drivers/usb/storage/usb.c 2005-11-28 16:10:25.000000000 +0100 -@@ -1,6 +1,6 @@ - /* Driver for USB Mass Storage compliant devices - * -- * $Id: usb.c,v 1.2 2004/08/30 06:54:48 sure Exp $ -+ * $Id: usb.c,v 1.2 2004/10/08 03:41:34 pete Exp $ - * - * Current development and maintenance by: - * (c) 1999-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net) -@@ -561,7 +561,7 @@ - GUID(guid); /* Global Unique Identifier */ - unsigned int flags; - struct us_unusual_dev *unusual_dev; -- struct us_data *ss = NULL, *pre_ss, *tmp /* grant */; -+ struct us_data *ss = NULL; /* grant */; - #ifdef CONFIG_USB_STORAGE_SDDR09 - int result; - #endif -@@ -705,23 +705,11 @@ - */ - ss = us_list; - /* modified to free unusable node by grant */ -- pre_ss = us_list; -+ - while ((ss != NULL) && - ((ss->pusb_dev) || !GUID_EQUAL(guid, ss->guid))) -- { -- pre_ss = ss; - ss = ss->next; -- } -- /* end mod */ --//super add --#if 0 -- if (ss != NULL){ -- scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); -- free_us_data( pre_ss, ss ); -- usb_dec_dev_use(dev); -- } --#endif --// -+ - if (ss != NULL) { - /* Existing device -- re-connect */ - US_DEBUGP("Found existing GUID " GUID_FORMAT "\n", -@@ -747,93 +735,6 @@ - USB_ENDPOINT_NUMBER_MASK; - ss->ep_int = ep_int; - -- /* grant 01/30 */ --#if 0 -- if ( 0x32 != dev->bus->bus_name[6] ) -- { -- dev->devpath[0] = dev->bus->bus_name[6] + 1; -- } -- /* restrict device on certain port */ -- if ( ss->htmplt.removable ^ (USB_DEVPATH_2 == dev->devpath[0]) ) -- { -- printk("* (old)%s disk not allowed on port:%s\n", ss->htmplt.removable ? "flash" : "hard", dev->devpath); -- usb_dec_dev_use(dev); -- scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); -- free_us_data( pre_ss, ss ); -- return NULL; -- } -- if (ss->htmplt.removable){ -- // add by super -- remove_proc_entry("usb_conn",NULL); -- *IXP425_GPIO_GPOUTR &= 0xfffb; -- create_proc_read_entry("usb_conn", -- 0, -- NULL, -- NULL, -- NULL -- ); -- }else{ -- remove_proc_entry("hd_conn",NULL); -- *IXP425_GPIO_GPOUTR &= 0xfff7; -- create_proc_read_entry("hd_conn", -- 0, -- NULL, -- NULL, -- NULL -- ); -- } -- printk("rscsi_disk capacity is %d@@@@@@@@@@@@@@@@\n",ss->host->host_queue->sector_size); -- if(ss->host->host_queue->sector_size<40000000){ -- ss->htmplt.removable = 1; -- } --#endif -- /* restrict device on certain port */ -- if ( ss->htmplt.removable && (USB_DEVPATH_1 == dev->devpath[0])) -- if ( ss->htmplt.removable ^ (USB_DEVPATH_2 == dev->devpath[0]) ) -- { -- create_proc_read_entry("usb_err", -- 0, -- NULL, -- NULL, -- NULL -- ); -- printk("* (old)%s disk not allowed on port:%s\n", ss->htmplt.removable ? "flash" : "hard", dev->devpath); -- usb_dec_dev_use(dev); -- scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); -- free_us_data( pre_ss, ss ); -- return NULL; -- } -- if (ss->htmplt.removable){ -- printk("is removable disk \n"); -- *IXP425_GPIO_GPOUTR &= 0xfffb; -- create_proc_read_entry("usb_conn", -- 0, -- NULL, -- NULL, -- NULL -- ); -- }else { -- printk("%x port connect\n",dev->devpath[0]); -- if(0x31 == dev->devpath[0]){ -- *IXP425_GPIO_GPOUTR &= 0xfff7; -- create_proc_read_entry("hd_conn", -- 0, -- NULL, -- NULL, -- NULL -- ); -- }else{ -- *IXP425_GPIO_GPOUTR &= 0xfffb; -- create_proc_read_entry("hd2_conn", -- 0, -- NULL, -- NULL, -- NULL -- ); -- } -- } -- //end -- - /* allocate an IRQ callback if one is needed */ - if ((ss->protocol == US_PR_CBI) && usb_stor_allocate_irq(ss)) { - usb_dec_dev_use(dev); -@@ -857,6 +756,23 @@ - up(&(ss->dev_semaphore)); - - } else { -+#if 0 -+ //grant,pete -+ if ( ss->htmplt.removable ^ (USB_DEVPATH_2 == dev->devpath[0]) ) -+ { -+ create_proc_read_entry("usb_err", -+ 0, -+ NULL, -+ NULL, -+ NULL -+ ); -+ printk("* (old)%s disk not allowed on port:%s\n", ss->htmplt.removable ? "flash" : "hard", dev->devpath); -+ usb_dec_dev_use(dev); -+ scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); -+ return NULL; -+ } -+ // -+#endif - /* New device -- allocate memory and initialize */ - US_DEBUGP("New GUID " GUID_FORMAT "\n", GUID_ARGS(guid)); - -@@ -1103,11 +1019,7 @@ - sizeof(usb_stor_host_template)); - - /* Grab the next host number */ -- //ss->host_number = my_host_number++; -- -- /* fix device name & host number by grant */ --// ss->host_number = dev->devpath[0] - USB_DEVPATH_1 ; -- ss->host_number = USB_DEVPATH_2 - dev->devpath[0]; -+ ss->host_number = my_host_number++; - - /* We abuse this pointer so we can pass the ss pointer to - * the host controller thread in us_detect. But how else are -@@ -1128,7 +1040,6 @@ - * the device if it needs initialization */ - if (unusual_dev && unusual_dev->initFunction) - unusual_dev->initFunction(ss); -- printk("before kernel thread \n"); - /* start up our control thread */ - ss->pid = kernel_thread(usb_stor_control_thread, ss, - CLONE_VM); -@@ -1146,60 +1057,11 @@ - - /* now register - our detect function will be called */ - ss->htmplt.module = THIS_MODULE; -- /*debug by grant*/ --// printk("!! 1\n"); - -- /* grant 01/30 */ -- // printk ("* bus = %c\n", dev->bus->bus_name[6]); -- #if 0 -- if ( 0x32 != dev->bus->bus_name[6] ) -- { -- dev->devpath[0] = dev->bus->bus_name[6] + 1; -- // dev->devpath[0] = 0x32; -- } --// printk("devpath = %c\n",dev->devpath[0]); --#endif - ss->htmplt.port = dev->devpath[0]; - -- tmp = us_list; -- pre_ss = tmp; -- while ( NULL != tmp ) -- { -- /* free old device node by grant */ -- if( (tmp->htmplt.port == ss->htmplt.port) && (!GUID_EQUAL(tmp->guid, ss->guid)) ) -- { -- scsi_unregister_module(MODULE_SCSI_HA, &(tmp->htmplt)); --// printk("* (2)scsi_unregister_module\n"); -- free_us_data( pre_ss, tmp ); -- break; -- } -- pre_ss = tmp; -- tmp = tmp->next; -- } -- - scsi_register_module(MODULE_SCSI_HA, &(ss->htmplt)); - -- /* check device port grant */ -- if ( 1 == ss->host->porttype ) -- { --// printk("* (usb)scsi_unregister_module\n"); -- scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); -- kfree(ss->current_urb); -- kfree(ss); -- usb_dec_dev_use(dev); -- return NULL; -- } -- -- /* debug grant */ -- i = 0; -- tmp = us_list; -- while ( NULL != tmp ) -- { -- i ++; -- tmp = tmp->next; -- } --// printk("* (usb)scsi_register_module okay! us_data:%d\n", i ); -- - /* lock access to the data structures */ - down(&us_list_semaphore); - -@@ -1248,34 +1110,18 @@ - } - - -- - /* Handle a disconnect event from the USB core */ - static void storage_disconnect(struct usb_device *dev, void *ptr) - { - struct us_data *ss = ptr; --// struct us_data *pre_ss; -+ struct us_data *tmp,*pre_ss; - int result; --//super add -- char serial[USB_STOR_STRING_LEN]; /* serial number */ --// GUID(guid); /* Global Unique Identifier */ --//super modify -- switch(dev->devpath[0]){ -- case 0x31: -- *IXP425_GPIO_GPOUTR |= 0x8; -- remove_proc_entry("hd_conn",NULL); -- break; -- case 0x32: -- *IXP425_GPIO_GPOUTR |= 0x4; -- remove_proc_entry("usb_conn",NULL); -- remove_proc_entry("hd2_conn",NULL); -- break; -- default: -- break; -- } --//end -+ //Pete -+ int i; -+ // -+ - US_DEBUGP("storage_disconnect() called\n"); - -- memset(serial,0,USB_STOR_STRING_LEN); - /* this is the odd case -- we disconnected but weren't using it */ - if (!ss) { - US_DEBUGP("-- device was not in use\n"); -@@ -1285,6 +1131,35 @@ - /* lock access to the device data structure */ - down(&(ss->dev_semaphore)); - -+ tmp = us_list; -+ pre_ss = tmp; -+ i = 0; -+ -+ while ( tmp != NULL ) -+ { -+ if( (tmp->htmplt.port == ss->htmplt.port) && (GUID_EQUAL(tmp->guid, ss->guid)) ) -+ { -+ scsi_unregister_module(MODULE_SCSI_HA, &(tmp->htmplt)); -+ if( ss == us_list ) -+ { -+ us_list = ss->next; -+ } -+ else if( ss->next == NULL ) -+ { -+ pre_ss->next = NULL; -+ } -+ else -+ { -+ pre_ss->next = ss->next; -+ } -+ -+ break; -+ } -+ i++; -+ pre_ss = tmp; -+ tmp = tmp->next; -+ } -+ - if(ss->extra && ss->extra_destructor){ - ss->extra_destructor(ss->extra); - } ---- R29/drivers/usb/usb.c 2004-07-07 08:31:44.000000000 +0100 -+++ R63/drivers/usb/usb.c 2005-06-29 06:26:23.000000000 +0100 -@@ -30,6 +30,7 @@ - #include <linux/init.h> - #include <linux/devfs_fs_kernel.h> - #include <linux/spinlock.h> -+#include <linux/proc_fs.h> - - #include <asm/hardware.h> - #ifdef CONFIG_USB_DEBUG -@@ -1014,12 +1015,11 @@ - if (atomic_dec_and_test(&dev->refcnt)) { - dev->bus->op->deallocate(dev); - usb_destroy_configuration(dev); -- - usb_bus_put(dev->bus); -- -- -+ - if(dev) - kfree(dev); -+ dev = NULL; - } - } - -@@ -1749,6 +1749,7 @@ - /* - * Something got disconnected. Get rid of it, and all of its children. - */ -+static int dev_num=0; - void usb_disconnect(struct usb_device **pdev) - { - struct usb_device * dev = *pdev; -@@ -1758,35 +1759,9 @@ - return; - - *pdev = NULL; -- -+ - info("USB disconnect on device %s-%s address %d", - dev->bus->bus_name, dev->devpath, dev->devnum); --#if 0 -- // add by super -- switch(dev->devpath[0]){ -- case 0x31: -- *IXP425_GPIO_GPOUTR |= 0x8; -- remove_proc_entry("hd_conn",NULL); -- break; -- case 0x32: -- *IXP425_GPIO_GPOUTR |= 0x4; -- remove_proc_entry("usb_conn",NULL); -- remove_proc_entry("hd2_conn",NULL); -- break; -- default: -- break; -- } -- if (*dev->devpath==0x31){ -- *IXP425_GPIO_GPOUTR |= 0x8; -- remove_proc_entry("hd_conn",NULL); -- }else{ -- *IXP425_GPIO_GPOUTR |= 0x4; -- remove_proc_entry("usb_conn",NULL); -- } --#endif -- if (*dev->devpath==0x31) -- remove_proc_entry("usb_err",NULL); -- //end - if (dev->actconfig) { - for (i = 0; i < dev->actconfig->bNumInterfaces; i++) { - struct usb_interface *interface = &dev->actconfig->interface[i]; -@@ -1808,7 +1783,7 @@ - if (*child) - usb_disconnect(child); - } -- -+ - /* Let policy agent unload modules etc */ - call_policy ("remove", dev); - -@@ -1817,7 +1792,7 @@ - clear_bit(dev->devnum, &dev->bus->devmap.devicemap); - usbdevfs_remove_device(dev); - } -- -+ - /* Free up the device itself */ - usb_free_dev(dev); - } -@@ -2292,7 +2267,7 @@ - - wait_ms(10); /* Let the SET_ADDRESS settle */ - --//super modify -+ //Pete - err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, &dev->descriptor, 8); - if (err < 8) { - if (err < 0) -@@ -2303,10 +2278,13 @@ - dev->devnum = -1; - return 1; - } --// -+ -+ //pete, reserve this printk here! -+ printk("Device descriptor:%d bytes received.\n",err); -+ - dev->epmaxpacketin [0] = dev->descriptor.bMaxPacketSize0; - dev->epmaxpacketout[0] = dev->descriptor.bMaxPacketSize0; -- -+ - err = usb_get_device_descriptor(dev); - if (err < (signed)sizeof(dev->descriptor)) { - if (err < 0) -@@ -2314,12 +2292,14 @@ - else - err("USB device descriptor short read (expected %Zi, got %i)", - sizeof(dev->descriptor), err); -- - clear_bit(dev->devnum, &dev->bus->devmap.devicemap); - dev->devnum = -1; - return 1; - } - -+ //pete, reserve this printk here! -+ printk("Device descriptor:%d bytes received.\n",err); -+ - err = usb_get_configuration(dev); - if (err < 0) { - err("unable to get device %d configuration (error=%d)", ---- R29/fs/fat/dir.c 2004-03-24 19:56:01.000000000 +0000 -+++ R63/fs/fat/dir.c 2005-03-31 04:30:53.000000000 +0100 -@@ -198,11 +198,11 @@ - int uni_xlate = MSDOS_SB(sb)->options.unicode_xlate; - int utf8 = MSDOS_SB(sb)->options.utf8; - unsigned short opt_shortname = MSDOS_SB(sb)->options.shortname; -- int ino, chl, i, j, last_u, res = 0; -- loff_t cpos = 0; -+ int chl, i, j, last_u, res = 0; -+ loff_t i_pos, cpos = 0; - - while(1) { -- if (fat_get_entry(inode,&cpos,&bh,&de,&ino) == -1) -+ if (fat_get_entry(inode,&cpos,&bh,&de,&i_pos) == -1) - goto EODir; - parse_record: - long_slots = 0; -@@ -253,7 +253,7 @@ - if (ds->id & 0x40) { - unicode[offset + 13] = 0; - } -- if (fat_get_entry(inode,&cpos,&bh,&de,&ino)<0) -+ if (fat_get_entry(inode,&cpos,&bh,&de,&i_pos)<0) - goto EODir; - if (slot == 0) - break; -@@ -368,8 +368,9 @@ - int utf8 = MSDOS_SB(sb)->options.utf8; - int nocase = MSDOS_SB(sb)->options.nocase; - unsigned short opt_shortname = MSDOS_SB(sb)->options.shortname; -- int ino, inum, chi, chl, i, i2, j, last, last_u, dotoffset = 0; -- loff_t cpos; -+ unsigned long inum; -+ int chi, chl, i, i2, j, last, last_u, dotoffset = 0; -+ loff_t i_pos, cpos; - - cpos = filp->f_pos; - /* Fake . and .. for the root directory. */ -@@ -392,7 +393,7 @@ - bh = NULL; - GetNew: - long_slots = 0; -- if (fat_get_entry(inode,&cpos,&bh,&de,&ino) == -1) -+ if (fat_get_entry(inode,&cpos,&bh,&de,&i_pos) == -1) - goto EODir; - /* Check for long filename entry */ - if (isvfat) { -@@ -449,7 +450,7 @@ - if (ds->id & 0x40) { - unicode[offset + 13] = 0; - } -- if (fat_get_entry(inode,&cpos,&bh,&de,&ino) == -1) -+ if (fat_get_entry(inode,&cpos,&bh,&de,&i_pos) == -1) - goto EODir; - if (slot == 0) - break; -@@ -541,7 +542,7 @@ - /* inum = fat_parent_ino(inode,0); */ - inum = filp->f_dentry->d_parent->d_inode->i_ino; - } else { -- struct inode *tmp = fat_iget(sb, ino); -+ struct inode *tmp = fat_iget(sb, i_pos); - if (tmp) { - inum = tmp->i_ino; - iput(tmp); -@@ -690,14 +691,14 @@ - /***** See if directory is empty */ - int fat_dir_empty(struct inode *dir) - { -- loff_t pos; -+ loff_t pos, i_pos; - struct buffer_head *bh; - struct msdos_dir_entry *de; -- int ino,result = 0; -+ int result = 0; - - pos = 0; - bh = NULL; -- while (fat_get_entry(dir,&pos,&bh,&de,&ino) > -1) { -+ while (fat_get_entry(dir,&pos,&bh,&de,&i_pos) > -1) { - /* Ignore vfat longname entries */ - if (de->attr == ATTR_EXT) - continue; -@@ -717,7 +718,7 @@ - /* This assumes that size of cluster is above the 32*slots */ - - int fat_add_entries(struct inode *dir,int slots, struct buffer_head **bh, -- struct msdos_dir_entry **de, int *ino) -+ struct msdos_dir_entry **de, loff_t *i_pos) - { - struct super_block *sb = dir->i_sb; - loff_t offset, curr; -@@ -727,7 +728,7 @@ - offset = curr = 0; - *bh = NULL; - row = 0; -- while (fat_get_entry(dir,&curr,bh,de,ino) > -1) { -+ while (fat_get_entry(dir,&curr,bh,de,i_pos) > -1) { - if (IS_FREE((*de)->name)) { - if (++row == slots) - return offset; -@@ -742,7 +743,7 @@ - if (!new_bh) - return -ENOSPC; - fat_brelse(sb, new_bh); -- do fat_get_entry(dir,&curr,bh,de,ino); while (++row<slots); -+ do fat_get_entry(dir,&curr,bh,de,i_pos); while (++row<slots); - return offset; - } - ---- R29/fs/fat/inode.c 2004-03-24 19:56:01.000000000 +0000 -+++ R63/fs/fat/inode.c 2005-03-31 07:17:14.000000000 +0100 -@@ -83,17 +83,17 @@ - } - } - --static inline unsigned long fat_hash(struct super_block *sb, int i_pos) -+static inline unsigned long fat_hash(struct super_block *sb, loff_t i_pos) - { - unsigned long tmp = (unsigned long)i_pos | (unsigned long) sb; - tmp = tmp + (tmp >> FAT_HASH_BITS) + (tmp >> FAT_HASH_BITS * 2); - return tmp & FAT_HASH_MASK; - } - --void fat_attach(struct inode *inode, int i_pos) -+void fat_attach(struct inode *inode, loff_t i_pos) - { - spin_lock(&fat_inode_lock); -- MSDOS_I(inode)->i_location = i_pos; -+ MSDOS_I(inode)->i_pos = i_pos; - list_add(&MSDOS_I(inode)->i_fat_hash, - fat_inode_hashtable + fat_hash(inode->i_sb, i_pos)); - spin_unlock(&fat_inode_lock); -@@ -102,13 +102,13 @@ - void fat_detach(struct inode *inode) - { - spin_lock(&fat_inode_lock); -- MSDOS_I(inode)->i_location = 0; -+ MSDOS_I(inode)->i_pos = 0; - list_del(&MSDOS_I(inode)->i_fat_hash); - INIT_LIST_HEAD(&MSDOS_I(inode)->i_fat_hash); - spin_unlock(&fat_inode_lock); - } - --struct inode *fat_iget(struct super_block *sb, int i_pos) -+struct inode *fat_iget(struct super_block *sb, loff_t i_pos) - { - struct list_head *p = fat_inode_hashtable + fat_hash(sb, i_pos); - struct list_head *walk; -@@ -120,7 +120,7 @@ - i = list_entry(walk, struct msdos_inode_info, i_fat_hash); - if (i->i_fat_inode->i_sb != sb) - continue; -- if (i->i_location != i_pos) -+ if (i->i_pos != i_pos) - continue; - inode = igrab(i->i_fat_inode); - if (inode) -@@ -133,11 +133,11 @@ - static void fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de); - - struct inode *fat_build_inode(struct super_block *sb, -- struct msdos_dir_entry *de, int ino, int *res) -+ struct msdos_dir_entry *de, loff_t i_pos, int *res) - { - struct inode *inode; - *res = 0; -- inode = fat_iget(sb, ino); -+ inode = fat_iget(sb, i_pos); - if (inode) - goto out; - inode = new_inode(sb); -@@ -147,7 +147,7 @@ - *res = 0; - inode->i_ino = iunique(sb, MSDOS_ROOT_INO); - fat_fill_inode(inode, de); -- fat_attach(inode, ino); -+ fat_attach(inode, i_pos); - insert_inode_hash(inode); - out: - return inode; -@@ -379,7 +379,7 @@ - int nr; - - INIT_LIST_HEAD(&MSDOS_I(inode)->i_fat_hash); -- MSDOS_I(inode)->i_location = 0; -+ MSDOS_I(inode)->i_pos = 0; - MSDOS_I(inode)->i_fat_inode = inode; - inode->i_uid = sbi->options.fs_uid; - inode->i_gid = sbi->options.fs_gid; -@@ -406,7 +406,7 @@ - } - inode->i_blksize = 1 << sbi->cluster_bits; - inode->i_blocks = ((inode->i_size + inode->i_blksize - 1) -- & ~(inode->i_blksize - 1)) >> 9; -+ & ~((loff_t)inode->i_blksize - 1)) >> 9; - MSDOS_I(inode)->i_logstart = 0; - MSDOS_I(inode)->mmu_private = inode->i_size; - -@@ -443,19 +443,25 @@ - return ERR_PTR(-ESTALE); - - inode = iget(sb, fh[0]); -- if (!inode || is_bad_inode(inode) || -- inode->i_generation != fh[1]) { -- if (inode) iput(inode); -+ if (!inode || is_bad_inode(inode) || inode->i_generation != fh[1]) { -+ if (inode) -+ iput(inode); - inode = NULL; - } - if (!inode) { -- /* try 2 - see if i_location is in F-d-c -+ loff_t i_pos; -+ int i_logstart = fh[3] & 0x0fffffff; -+ -+ i_pos = (loff_t)fh[2] << 8; -+ i_pos |= ((fh[3] >> 24) & 0xf0) | (fh[4] >> 28); -+ -+ /* try 2 - see if i_pos is in F-d-c - * require i_logstart to be the same - * Will fail if you truncate and then re-write - */ - -- inode = fat_iget(sb, fh[2]); -- if (inode && MSDOS_I(inode)->i_logstart != fh[3]) { -+ inode = fat_iget(sb, i_pos); -+ if (inode && MSDOS_I(inode)->i_logstart != i_logstart) { - iput(inode); - inode = NULL; - } -@@ -505,23 +511,26 @@ - result->d_op = sb->s_root->d_op; - result->d_flags |= DCACHE_NFSD_DISCONNECTED; - return result; -- -- - } - - int fat_dentry_to_fh(struct dentry *de, __u32 *fh, int *lenp, int needparent) - { - int len = *lenp; - struct inode *inode = de->d_inode; -+ u32 ipos_h, ipos_m, ipos_l; - - if (len < 5) - return 255; /* no room */ -+ -+ ipos_h = MSDOS_I(inode)->i_pos >> 8; -+ ipos_m = (MSDOS_I(inode)->i_pos & 0xf0) << 24; -+ ipos_l = (MSDOS_I(inode)->i_pos & 0x0f) << 28; - *lenp = 5; - fh[0] = inode->i_ino; - fh[1] = inode->i_generation; -- fh[2] = MSDOS_I(inode)->i_location; -- fh[3] = MSDOS_I(inode)->i_logstart; -- fh[4] = MSDOS_I(de->d_parent->d_inode)->i_logstart; -+ fh[2] = ipos_h; -+ fh[3] = ipos_m | MSDOS_I(inode)->i_logstart; -+ fh[4] = ipos_l | MSDOS_I(de->d_parent->d_inode)->i_logstart; - return 3; - } - -@@ -636,7 +645,7 @@ - - sbi->cluster_bits = ffs(logical_sector_size * sbi->cluster_size) - 1; - sbi->fats = b->fats; -- sbi->fat_start = CF_LE_W(b->reserved); -+ sbi->fat_start = CF_LE_W(b->reserved);
- sbi->prev_free = 0; - if (!b->fat_length && b->fat32_length) { - struct fat_boot_fsinfo *fsinfo; -@@ -647,7 +656,8 @@ - fat32 = 1; - sbi->fat_length = CF_LE_L(b->fat32_length); - sbi->root_cluster = CF_LE_L(b->root_cluster); -- -+ sb->s_maxbytes = 0xffffffff;
-+
- sbi->fsinfo_sector = CF_LE_W(b->info_sector); - /* MC - if info_sector is 0, don't multiply by 0 */ - if (sbi->fsinfo_sector == 0) -@@ -891,7 +901,7 @@ - int nr; - - INIT_LIST_HEAD(&MSDOS_I(inode)->i_fat_hash); -- MSDOS_I(inode)->i_location = 0; -+ MSDOS_I(inode)->i_pos = 0; - MSDOS_I(inode)->i_fat_inode = inode; - inode->i_uid = sbi->options.fs_uid; - inode->i_gid = sbi->options.fs_gid; -@@ -906,10 +916,9 @@ - inode->i_fop = &fat_dir_operations; - - MSDOS_I(inode)->i_start = CF_LE_W(de->start); -- if (sbi->fat_bits == 32) { -- MSDOS_I(inode)->i_start |= -- (CF_LE_W(de->starthi) << 16); -- } -+ if (sbi->fat_bits == 32) -+ MSDOS_I(inode)->i_start |= (CF_LE_W(de->starthi) << 16); -+ - MSDOS_I(inode)->i_logstart = MSDOS_I(inode)->i_start; - inode->i_nlink = fat_subdirs(inode); - /* includes .., compensating for "self" */ -@@ -956,7 +965,7 @@ - /* this is as close to the truth as we can get ... */ - inode->i_blksize = 1 << sbi->cluster_bits; - inode->i_blocks = ((inode->i_size + inode->i_blksize - 1) -- & ~(inode->i_blksize - 1)) >> 9; -+ & ~((loff_t)inode->i_blksize - 1)) >> 9; - inode->i_mtime = inode->i_atime = - date_dos2unix(CF_LE_W(de->time),CF_LE_W(de->date)); - inode->i_ctime = -@@ -971,22 +980,22 @@ - struct super_block *sb = inode->i_sb; - struct buffer_head *bh; - struct msdos_dir_entry *raw_entry; -- unsigned int i_pos; -+ loff_t i_pos; - - retry: -- i_pos = MSDOS_I(inode)->i_location; -+ i_pos = MSDOS_I(inode)->i_pos; - if (inode->i_ino == MSDOS_ROOT_INO || !i_pos) { - return; - } - lock_kernel(); - if (!(bh = fat_bread(sb, i_pos >> MSDOS_SB(sb)->dir_per_block_bits))) { -- printk("dev = %s, ino = %d\n", kdevname(inode->i_dev), i_pos); -+ printk("dev = %s, i_pos = %llu\n", kdevname(inode->i_dev), i_pos); - fat_fs_panic(sb, "msdos_write_inode: unable to read i-node block"); - unlock_kernel(); - return; - } - spin_lock(&fat_inode_lock); -- if (i_pos != MSDOS_I(inode)->i_location) { -+ if (i_pos != MSDOS_I(inode)->i_pos) { - spin_unlock(&fat_inode_lock); - fat_brelse(sb, bh); - unlock_kernel(); ---- R29/fs/fat/misc.c 2004-03-24 19:56:01.000000000 +0000 -+++ R63/fs/fat/misc.c 2005-03-31 04:20:35.000000000 +0100 -@@ -316,11 +316,12 @@ - */ - - int fat__get_entry(struct inode *dir, loff_t *pos,struct buffer_head **bh, -- struct msdos_dir_entry **de, int *ino) -+ struct msdos_dir_entry **de, loff_t *i_pos) - { - struct super_block *sb = dir->i_sb; - struct msdos_sb_info *sbi = MSDOS_SB(sb); -- int sector, offset; -+ int sector; -+ loff_t offset; - - while (1) { - offset = *pos; -@@ -343,7 +344,7 @@ - - offset &= sb->s_blocksize - 1; - *de = (struct msdos_dir_entry *) ((*bh)->b_data + offset); -- *ino = (sector << sbi->dir_per_block_bits) + (offset >> MSDOS_DIR_BITS); -+ *i_pos = ((loff_t)sector << sbi->dir_per_block_bits) + (offset >> MSDOS_DIR_BITS); - - return 0; - } -@@ -383,7 +384,7 @@ - done = !IS_FREE(data[entry].name) \ - && ( \ - ( \ -- (MSDOS_SB(sb)->fat_bits != 32) ? 0 : (CF_LE_W(data[entry].starthi) << 16) \ -+ (sbi->fat_bits != 32) ? 0 : (CF_LE_W(data[entry].starthi) << 16) \ - ) \ - | CF_LE_W(data[entry].start) \ - ) == *number; -@@ -400,35 +401,38 @@ - (*number)++; \ - } - --static int raw_scan_sector(struct super_block *sb,int sector,const char *name, -- int *number,int *ino,struct buffer_head **res_bh, -- struct msdos_dir_entry **res_de) -+static int raw_scan_sector(struct super_block *sb, int sector, -+ const char *name, int *number, loff_t *i_pos, -+ struct buffer_head **res_bh, -+ struct msdos_dir_entry **res_de) - { -+ struct msdos_sb_info *sbi = MSDOS_SB(sb); - struct buffer_head *bh; - struct msdos_dir_entry *data; - int entry,start,done; - -- if (!(bh = fat_bread(sb,sector))) -+ if (!(bh = fat_bread(sb, sector))) - return -EIO; - data = (struct msdos_dir_entry *) bh->b_data; -- for (entry = 0; entry < MSDOS_SB(sb)->dir_per_block; entry++) { -+ for (entry = 0; entry < sbi->dir_per_block; entry++) { - /* RSS_COUNT: if (data[entry].name == name) done=true else done=false. */ - if (name) { - RSS_NAME - } else { -- if (!ino) RSS_COUNT -+ if (!i_pos) RSS_COUNT - else { - if (number) RSS_START - else RSS_FREE - } - } - if (done) { -- if (ino) -- *ino = sector * MSDOS_SB(sb)->dir_per_block + entry; -+ if (i_pos) { -+ *i_pos = ((loff_t)sector << sbi->dir_per_block_bits) + entry; -+ } - start = CF_LE_W(data[entry].start); -- if (MSDOS_SB(sb)->fat_bits == 32) { -+ if (sbi->fat_bits == 32) - start |= (CF_LE_W(data[entry].starthi) << 16); -- } -+ - if (!res_bh) - fat_brelse(sb, bh); - else { -@@ -448,16 +452,19 @@ - * requested entry is found or the end of the directory is reached. - */ - --static int raw_scan_root(struct super_block *sb,const char *name,int *number,int *ino, -- struct buffer_head **res_bh,struct msdos_dir_entry **res_de) -+static int raw_scan_root(struct super_block *sb, const char *name, -+ int *number, loff_t *i_pos, -+ struct buffer_head **res_bh, -+ struct msdos_dir_entry **res_de) - { - int count,cluster; - - for (count = 0; - count < MSDOS_SB(sb)->dir_entries / MSDOS_SB(sb)->dir_per_block; - count++) { -- if ((cluster = raw_scan_sector(sb,MSDOS_SB(sb)->dir_start+count, -- name,number,ino,res_bh,res_de)) >= 0) -+ cluster = raw_scan_sector(sb, MSDOS_SB(sb)->dir_start + count, -+ name, number, i_pos, res_bh, res_de); -+ if (cluster >= 0) - return cluster; - } - return -ENOENT; -@@ -469,20 +476,24 @@ - * requested entry is found or the end of the directory is reached. - */ - --static int raw_scan_nonroot(struct super_block *sb,int start,const char *name, -- int *number,int *ino,struct buffer_head **res_bh,struct msdos_dir_entry -- **res_de) -+static int raw_scan_nonroot(struct super_block *sb, int start, const char *name, -+ int *number, loff_t *i_pos, -+ struct buffer_head **res_bh, -+ struct msdos_dir_entry **res_de) - { -- int count,cluster; -+ struct msdos_sb_info *sbi = MSDOS_SB(sb); -+ int count, cluster, sector; - - #ifdef DEBUG - printk("raw_scan_nonroot: start=%d\n",start); - #endif - do { -- for (count = 0; count < MSDOS_SB(sb)->cluster_size; count++) { -- if ((cluster = raw_scan_sector(sb,(start-2)* -- MSDOS_SB(sb)->cluster_size+MSDOS_SB(sb)->data_start+ -- count,name,number,ino,res_bh,res_de)) >= 0) -+ for (count = 0; count < sbi->cluster_size; count++) { -+ sector = (start - 2) * sbi->cluster_size -+ + count + sbi->data_start; -+ cluster = raw_scan_sector(sb, sector, name, number, -+ i_pos, res_bh, res_de); -+ if (cluster >= 0) - return cluster; - } - if (!(start = fat_access(sb,start,-1))) { -@@ -506,13 +517,13 @@ - */ - - static int raw_scan(struct super_block *sb, int start, const char *name, -- int *number, int *ino, struct buffer_head **res_bh, -- struct msdos_dir_entry **res_de) -+ loff_t *i_pos, struct buffer_head **res_bh, -+ struct msdos_dir_entry **res_de) - { - if (start) -- return raw_scan_nonroot(sb,start,name,number,ino,res_bh,res_de); -+ return raw_scan_nonroot(sb,start,name,NULL,i_pos,res_bh,res_de); - else -- return raw_scan_root(sb,name,number,ino,res_bh,res_de); -+ return raw_scan_root(sb,name,NULL,i_pos,res_bh,res_de); - } - - /* -@@ -521,19 +532,21 @@ - */ - int fat_subdirs(struct inode *dir) - { -- int count; -+ struct msdos_sb_info *sbi = MSDOS_SB(dir->i_sb); -+ int number; - -- count = 0; -- if ((dir->i_ino == MSDOS_ROOT_INO) && -- (MSDOS_SB(dir->i_sb)->fat_bits != 32)) { -- (void) raw_scan_root(dir->i_sb,NULL,&count,NULL,NULL,NULL); -- } else { -- if ((dir->i_ino != MSDOS_ROOT_INO) && -- !MSDOS_I(dir)->i_start) return 0; /* in mkdir */ -- else (void) raw_scan_nonroot(dir->i_sb,MSDOS_I(dir)->i_start, -- NULL,&count,NULL,NULL,NULL); -+ number = 0; -+ if ((dir->i_ino == MSDOS_ROOT_INO) && (sbi->fat_bits != 32)) -+ raw_scan_root(dir->i_sb, NULL, &number, NULL, NULL, NULL); -+ else { -+ if ((dir->i_ino != MSDOS_ROOT_INO) && !MSDOS_I(dir)->i_start) -+ return 0; /* in mkdir */ -+ else { -+ raw_scan_nonroot(dir->i_sb, MSDOS_I(dir)->i_start, -+ NULL, &number, NULL, NULL, NULL); -+ } - } -- return count; -+ return number; - } - - -@@ -542,12 +555,12 @@ - * for an empty directory slot (name is NULL). Returns an error code or zero. - */ - --int fat_scan(struct inode *dir,const char *name,struct buffer_head **res_bh, -- struct msdos_dir_entry **res_de,int *ino) -+int fat_scan(struct inode *dir, const char *name, struct buffer_head **res_bh, -+ struct msdos_dir_entry **res_de, loff_t *i_pos) - { - int res; - -- res = raw_scan(dir->i_sb,MSDOS_I(dir)->i_start, -- name, NULL, ino, res_bh, res_de); -- return res<0 ? res : 0; -+ res = raw_scan(dir->i_sb, MSDOS_I(dir)->i_start, name, i_pos, -+ res_bh, res_de); -+ return (res < 0) ? res : 0; - } ---- R29/fs/nls/nls_cp932.c 2004-03-24 19:56:02.000000000 +0000 -+++ R63/fs/nls/nls_cp932.c 2005-08-09 03:30:27.000000000 +0100 -@@ -7859,7 +7859,7 @@ - if (boundlen <= 0) - return -ENAMETOOLONG; - -- if (rawstring[0] <= 0x7F) { -+ if (rawstring[0] <= 0x7F || !(rawstring[1]>=0x40 && rawstring[1]<=0xFC && rawstring[1]!=0x7F)) { - *uni = rawstring[0]; - return 1; - } ---- R29/fs/nls/nls_cp936.c 2004-03-24 19:56:02.000000000 +0000 -+++ R63/fs/nls/nls_cp936.c 2005-08-09 04:01:39.000000000 +0100 -@@ -3,8 +3,10 @@ - * - * Charset cp936 translation tables. - * This translation table was generated automatically, the -- * original table can be download from the Microsoft website. -- * (http://www.microsoft.com/typography/unicode/unicodecp.htm) -+ * original table can be found at the Microsoft website. -+ * (http://www.microsoft.com/globaldev/reference/dbcs/936.htm) -+ * download GBK.TXT from MIT Edu website -+ * (http://web.mit.edu/afs/dev.mit.edu/source/src-current/third/libiconv/tests/GBK.TXT) - */ - - #include <linux/module.h> -@@ -29,7 +31,7 @@ - 0x4E63,0x4E64,0x4E65,0x4E67,0x4E68,0x4E6A,0x4E6B,0x4E6C,/* 0x60-0x67 */ - 0x4E6D,0x4E6E,0x4E6F,0x4E72,0x4E74,0x4E75,0x4E76,0x4E77,/* 0x68-0x6F */ - 0x4E78,0x4E79,0x4E7A,0x4E7B,0x4E7C,0x4E7D,0x4E7F,0x4E80,/* 0x70-0x77 */ -- 0x4E81,0xF91B,0x4E83,0x4E84,0x4E85,0x4E87,0x4E8A,0x0000,/* 0x78-0x7F */ -+ 0x4E81,0x4E82,0x4E83,0x4E84,0x4E85,0x4E87,0x4E8A,0x0000,/* 0x78-0x7F */ - - 0x4E90,0x4E96,0x4E97,0x4E99,0x4E9C,0x4E9D,0x4E9E,0x4EA3,/* 0x80-0x87 */ - 0x4EAA,0x4EAF,0x4EB0,0x4EB1,0x4EB4,0x4EB6,0x4EB7,0x4EB8,/* 0x88-0x8F */ -@@ -44,7 +46,7 @@ - 0x4F47,0x4F48,0x4F49,0x4F4A,0x4F4B,0x4F4C,0x4F52,0x4F54,/* 0xD0-0xD7 */ - 0x4F56,0x4F61,0x4F62,0x4F66,0x4F68,0x4F6A,0x4F6B,0x4F6D,/* 0xD8-0xDF */ - 0x4F6E,0x4F71,0x4F72,0x4F75,0x4F77,0x4F78,0x4F79,0x4F7A,/* 0xE0-0xE7 */ -- 0x4F7D,0x4F80,0x4F81,0x4F82,0x4F85,0xF92D,0x4F87,0x4F8A,/* 0xE8-0xEF */ -+ 0x4F7D,0x4F80,0x4F81,0x4F82,0x4F85,0x4F86,0x4F87,0x4F8A,/* 0xE8-0xEF */ - 0x4F8C,0x4F8E,0x4F90,0x4F92,0x4F93,0x4F95,0x4F96,0x4F98,/* 0xF0-0xF7 */ - 0x4F99,0x4F9A,0x4F9C,0x4F9E,0x4F9F,0x4FA1,0x4FA2,0x0000,/* 0xF8-0xFF */ - }; -@@ -69,7 +71,7 @@ - - 0x500B,0x500E,0x5010,0x5011,0x5013,0x5015,0x5016,0x5017,/* 0x80-0x87 */ - 0x501B,0x501D,0x501E,0x5020,0x5022,0x5023,0x5024,0x5027,/* 0x88-0x8F */ -- 0xF9D4,0x502F,0x5030,0x5031,0x5032,0x5033,0x5034,0x5035,/* 0x90-0x97 */ -+ 0x502B,0x502F,0x5030,0x5031,0x5032,0x5033,0x5034,0x5035,/* 0x90-0x97 */ - 0x5036,0x5037,0x5038,0x5039,0x503B,0x503D,0x503F,0x5040,/* 0x98-0x9F */ - 0x5041,0x5042,0x5044,0x5045,0x5046,0x5049,0x504A,0x504B,/* 0xA0-0xA7 */ - 0x504D,0x5050,0x5051,0x5052,0x5053,0x5054,0x5056,0x5057,/* 0xA8-0xAF */ -@@ -112,7 +114,7 @@ - 0x513C,0x513D,0x513E,0x5142,0x5147,0x514A,0x514C,0x514E,/* 0xB0-0xB7 */ - 0x514F,0x5150,0x5152,0x5153,0x5157,0x5158,0x5159,0x515B,/* 0xB8-0xBF */ - 0x515D,0x515E,0x515F,0x5160,0x5161,0x5163,0x5164,0x5166,/* 0xC0-0xC7 */ -- 0x5167,0xF978,0x516A,0x516F,0x5172,0x517A,0x517E,0x517F,/* 0xC8-0xCF */ -+ 0x5167,0x5169,0x516A,0x516F,0x5172,0x517A,0x517E,0x517F,/* 0xC8-0xCF */ - 0x5183,0x5184,0x5186,0x5187,0x518A,0x518B,0x518E,0x518F,/* 0xD0-0xD7 */ - 0x5190,0x5191,0x5193,0x5194,0x5198,0x519A,0x519D,0x519E,/* 0xD8-0xDF */ - 0x519F,0x51A1,0x51A3,0x51A6,0x51A7,0x51A8,0x51A9,0x51AA,/* 0xE0-0xE7 */ -@@ -130,7 +132,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x51D8,0x51D9,0x51DA,0xF954,0xFA15,0x51DF,0x51E2,0x51E3,/* 0x40-0x47 */ -+ 0x51D8,0x51D9,0x51DA,0x51DC,0x51DE,0x51DF,0x51E2,0x51E3,/* 0x40-0x47 */ - 0x51E5,0x51E6,0x51E7,0x51E8,0x51E9,0x51EA,0x51EC,0x51EE,/* 0x48-0x4F */ - 0x51F1,0x51F2,0x51F4,0x51F7,0x51FE,0x5204,0x5205,0x5209,/* 0x50-0x57 */ - 0x520B,0x520C,0x520F,0x5210,0x5213,0x5214,0x5215,0x521C,/* 0x58-0x5F */ -@@ -143,16 +145,16 @@ - 0x5264,0x5266,0x5268,0x526B,0x526C,0x526D,0x526E,0x5270,/* 0x88-0x8F */ - 0x5271,0x5273,0x5274,0x5275,0x5276,0x5277,0x5278,0x5279,/* 0x90-0x97 */ - 0x527A,0x527B,0x527C,0x527E,0x5280,0x5283,0x5284,0x5285,/* 0x98-0x9F */ -- 0x5286,0x5287,0xF9C7,0x528A,0x528B,0x528C,0x528D,0x528E,/* 0xA0-0xA7 */ -+ 0x5286,0x5287,0x5289,0x528A,0x528B,0x528C,0x528D,0x528E,/* 0xA0-0xA7 */ - 0x528F,0x5291,0x5292,0x5294,0x5295,0x5296,0x5297,0x5298,/* 0xA8-0xAF */ - 0x5299,0x529A,0x529C,0x52A4,0x52A5,0x52A6,0x52A7,0x52AE,/* 0xB0-0xB7 */ - 0x52AF,0x52B0,0x52B4,0x52B5,0x52B6,0x52B7,0x52B8,0x52B9,/* 0xB8-0xBF */ - 0x52BA,0x52BB,0x52BC,0x52BD,0x52C0,0x52C1,0x52C2,0x52C4,/* 0xC0-0xC7 */ - 0x52C5,0x52C6,0x52C8,0x52CA,0x52CC,0x52CD,0x52CE,0x52CF,/* 0xC8-0xCF */ - 0x52D1,0x52D3,0x52D4,0x52D5,0x52D7,0x52D9,0x52DA,0x52DB,/* 0xD0-0xD7 */ -- 0x52DC,0x52DD,0xF92F,0x52E0,0x52E1,0x52E2,0x52E3,0x52E5,/* 0xD8-0xDF */ -+ 0x52DC,0x52DD,0x52DE,0x52E0,0x52E1,0x52E2,0x52E3,0x52E5,/* 0xD8-0xDF */ - 0x52E6,0x52E7,0x52E8,0x52E9,0x52EA,0x52EB,0x52EC,0x52ED,/* 0xE0-0xE7 */ -- 0x52EE,0x52EF,0x52F1,0x52F2,0x52F3,0x52F4,0xF97F,0x52F6,/* 0xE8-0xEF */ -+ 0x52EE,0x52EF,0x52F1,0x52F2,0x52F3,0x52F4,0x52F5,0x52F6,/* 0xE8-0xEF */ - 0x52F7,0x52F8,0x52FB,0x52FC,0x52FD,0x5301,0x5302,0x5303,/* 0xF0-0xF7 */ - 0x5304,0x5307,0x5309,0x530A,0x530B,0x530C,0x530E,0x0000,/* 0xF8-0xFF */ - }; -@@ -179,12 +181,12 @@ - 0x539B,0x539C,0x539E,0x53A0,0x53A1,0x53A4,0x53A7,0x53AA,/* 0x88-0x8F */ - 0x53AB,0x53AC,0x53AD,0x53AF,0x53B0,0x53B1,0x53B2,0x53B3,/* 0x90-0x97 */ - 0x53B4,0x53B5,0x53B7,0x53B8,0x53B9,0x53BA,0x53BC,0x53BD,/* 0x98-0x9F */ -- 0x53BE,0x53C0,0xF96B,0x53C4,0x53C5,0x53C6,0x53C7,0x53CE,/* 0xA0-0xA7 */ -+ 0x53BE,0x53C0,0x53C3,0x53C4,0x53C5,0x53C6,0x53C7,0x53CE,/* 0xA0-0xA7 */ - 0x53CF,0x53D0,0x53D2,0x53D3,0x53D5,0x53DA,0x53DC,0x53DD,/* 0xA8-0xAF */ - 0x53DE,0x53E1,0x53E2,0x53E7,0x53F4,0x53FA,0x53FE,0x53FF,/* 0xB0-0xB7 */ - 0x5400,0x5402,0x5405,0x5407,0x540B,0x5414,0x5418,0x5419,/* 0xB8-0xBF */ - 0x541A,0x541C,0x5422,0x5424,0x5425,0x542A,0x5430,0x5433,/* 0xC0-0xC7 */ -- 0x5436,0x5437,0x543A,0x543D,0x543F,0x5441,0xF980,0x5444,/* 0xC8-0xCF */ -+ 0x5436,0x5437,0x543A,0x543D,0x543F,0x5441,0x5442,0x5444,/* 0xC8-0xCF */ - 0x5445,0x5447,0x5449,0x544C,0x544D,0x544E,0x544F,0x5451,/* 0xD0-0xD7 */ - 0x545A,0x545D,0x545E,0x545F,0x5460,0x5461,0x5463,0x5465,/* 0xD8-0xDF */ - 0x5467,0x5469,0x546A,0x546B,0x546C,0x546D,0x546E,0x546F,/* 0xE0-0xE7 */ -@@ -312,7 +314,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x583E,0x583F,0x5840,0x5841,0x5842,0x5843,0x5845,0x5846,/* 0x40-0x47 */ - 0x5847,0x5848,0x5849,0x584A,0x584B,0x584E,0x584F,0x5850,/* 0x48-0x4F */ -- 0x5852,0x5853,0x5855,0x5856,0x5857,0x5859,0xFA10,0x585B,/* 0x50-0x57 */ -+ 0x5852,0x5853,0x5855,0x5856,0x5857,0x5859,0x585A,0x585B,/* 0x50-0x57 */ - 0x585C,0x585D,0x585F,0x5860,0x5861,0x5862,0x5863,0x5864,/* 0x58-0x5F */ - 0x5866,0x5867,0x5868,0x5869,0x586A,0x586D,0x586E,0x586F,/* 0x60-0x67 */ - 0x5870,0x5871,0x5872,0x5873,0x5874,0x5875,0x5876,0x5877,/* 0x68-0x6F */ -@@ -326,8 +328,8 @@ - 0x58B5,0x58B6,0x58B7,0x58B8,0x58B9,0x58BA,0x58BB,0x58BD,/* 0xA0-0xA7 */ - 0x58BE,0x58BF,0x58C0,0x58C2,0x58C3,0x58C4,0x58C6,0x58C7,/* 0xA8-0xAF */ - 0x58C8,0x58C9,0x58CA,0x58CB,0x58CC,0x58CD,0x58CE,0x58CF,/* 0xB0-0xB7 */ -- 0x58D0,0x58D2,0x58D3,0x58D4,0x58D6,0x58D7,0xF94A,0x58D9,/* 0xB8-0xBF */ -- 0x58DA,0x58DB,0x58DC,0x58DD,0x58DE,0xF942,0x58E0,0x58E1,/* 0xC0-0xC7 */ -+ 0x58D0,0x58D2,0x58D3,0x58D4,0x58D6,0x58D7,0x58D8,0x58D9,/* 0xB8-0xBF */ -+ 0x58DA,0x58DB,0x58DC,0x58DD,0x58DE,0x58DF,0x58E0,0x58E1,/* 0xC0-0xC7 */ - 0x58E2,0x58E3,0x58E5,0x58E6,0x58E7,0x58E8,0x58E9,0x58EA,/* 0xC8-0xCF */ - 0x58ED,0x58EF,0x58F1,0x58F2,0x58F4,0x58F5,0x58F7,0x58F8,/* 0xD0-0xD7 */ - 0x58FA,0x58FB,0x58FC,0x58FD,0x58FE,0x58FF,0x5900,0x5901,/* 0xD8-0xDF */ -@@ -428,7 +430,7 @@ - 0x5BC8,0x5BC9,0x5BCA,0x5BCB,0x5BCD,0x5BCE,0x5BCF,0x0000,/* 0x78-0x7F */ - - 0x5BD1,0x5BD4,0x5BD5,0x5BD6,0x5BD7,0x5BD8,0x5BD9,0x5BDA,/* 0x80-0x87 */ -- 0x5BDB,0x5BDC,0x5BE0,0x5BE2,0x5BE3,0x5BE6,0xF9AA,0x5BE9,/* 0x88-0x8F */ -+ 0x5BDB,0x5BDC,0x5BE0,0x5BE2,0x5BE3,0x5BE6,0x5BE7,0x5BE9,/* 0x88-0x8F */ - 0x5BEA,0x5BEB,0x5BEC,0x5BED,0x5BEF,0x5BF1,0x5BF2,0x5BF3,/* 0x90-0x97 */ - 0x5BF4,0x5BF5,0x5BF6,0x5BF7,0x5BFD,0x5BFE,0x5C00,0x5C02,/* 0x98-0x9F */ - 0x5C03,0x5C05,0x5C07,0x5C08,0x5C0B,0x5C0C,0x5C0D,0x5C0E,/* 0xA0-0xA7 */ -@@ -437,7 +439,7 @@ - 0x5C2D,0x5C2E,0x5C2F,0x5C30,0x5C32,0x5C33,0x5C35,0x5C36,/* 0xB8-0xBF */ - 0x5C37,0x5C43,0x5C44,0x5C46,0x5C47,0x5C4C,0x5C4D,0x5C52,/* 0xC0-0xC7 */ - 0x5C53,0x5C54,0x5C56,0x5C57,0x5C58,0x5C5A,0x5C5B,0x5C5C,/* 0xC8-0xCF */ -- 0x5C5D,0x5C5F,0xF94B,0x5C64,0x5C67,0x5C68,0x5C69,0x5C6A,/* 0xD0-0xD7 */ -+ 0x5C5D,0x5C5F,0x5C62,0x5C64,0x5C67,0x5C68,0x5C69,0x5C6A,/* 0xD0-0xD7 */ - 0x5C6B,0x5C6C,0x5C6D,0x5C70,0x5C72,0x5C73,0x5C74,0x5C75,/* 0xD8-0xDF */ - 0x5C76,0x5C77,0x5C78,0x5C7B,0x5C7C,0x5C7D,0x5C7E,0x5C80,/* 0xE0-0xE7 */ - 0x5C83,0x5C84,0x5C85,0x5C86,0x5C87,0x5C89,0x5C8A,0x5C8B,/* 0xE8-0xEF */ -@@ -465,12 +467,12 @@ - - 0x5D01,0x5D04,0x5D05,0x5D08,0x5D09,0x5D0A,0x5D0B,0x5D0C,/* 0x80-0x87 */ - 0x5D0D,0x5D0F,0x5D10,0x5D11,0x5D12,0x5D13,0x5D15,0x5D17,/* 0x88-0x8F */ -- 0x5D18,0xF9D5,0x5D1A,0x5D1C,0x5D1D,0x5D1F,0x5D20,0x5D21,/* 0x90-0x97 */ -+ 0x5D18,0x5D19,0x5D1A,0x5D1C,0x5D1D,0x5D1F,0x5D20,0x5D21,/* 0x90-0x97 */ - 0x5D22,0x5D23,0x5D25,0x5D28,0x5D2A,0x5D2B,0x5D2C,0x5D2F,/* 0x98-0x9F */ - 0x5D30,0x5D31,0x5D32,0x5D33,0x5D35,0x5D36,0x5D37,0x5D38,/* 0xA0-0xA7 */ - 0x5D39,0x5D3A,0x5D3B,0x5D3C,0x5D3F,0x5D40,0x5D41,0x5D42,/* 0xA8-0xAF */ - 0x5D43,0x5D44,0x5D45,0x5D46,0x5D48,0x5D49,0x5D4D,0x5D4E,/* 0xB0-0xB7 */ -- 0x5D4F,0xF921,0x5D51,0x5D52,0x5D53,0x5D54,0x5D55,0x5D56,/* 0xB8-0xBF */ -+ 0x5D4F,0x5D50,0x5D51,0x5D52,0x5D53,0x5D54,0x5D55,0x5D56,/* 0xB8-0xBF */ - 0x5D57,0x5D59,0x5D5A,0x5D5C,0x5D5E,0x5D5F,0x5D60,0x5D61,/* 0xC0-0xC7 */ - 0x5D62,0x5D63,0x5D64,0x5D65,0x5D66,0x5D67,0x5D68,0x5D6A,/* 0xC8-0xCF */ - 0x5D6D,0x5D6E,0x5D70,0x5D71,0x5D72,0x5D73,0x5D75,0x5D76,/* 0xD0-0xD7 */ -@@ -493,7 +495,7 @@ - 0x5DA1,0x5DA2,0x5DA3,0x5DA4,0x5DA5,0x5DA6,0x5DA7,0x5DA8,/* 0x40-0x47 */ - 0x5DA9,0x5DAA,0x5DAB,0x5DAC,0x5DAD,0x5DAE,0x5DAF,0x5DB0,/* 0x48-0x4F */ - 0x5DB1,0x5DB2,0x5DB3,0x5DB4,0x5DB5,0x5DB6,0x5DB8,0x5DB9,/* 0x50-0x57 */ -- 0xF9AB,0x5DBB,0x5DBC,0x5DBD,0x5DBE,0x5DBF,0x5DC0,0x5DC1,/* 0x58-0x5F */ -+ 0x5DBA,0x5DBB,0x5DBC,0x5DBD,0x5DBE,0x5DBF,0x5DC0,0x5DC1,/* 0x58-0x5F */ - 0x5DC2,0x5DC3,0x5DC4,0x5DC6,0x5DC7,0x5DC8,0x5DC9,0x5DCA,/* 0x60-0x67 */ - 0x5DCB,0x5DCC,0x5DCE,0x5DCF,0x5DD0,0x5DD1,0x5DD2,0x5DD3,/* 0x68-0x6F */ - 0x5DD4,0x5DD5,0x5DD6,0x5DD7,0x5DD8,0x5DD9,0x5DDA,0x5DDC,/* 0x70-0x77 */ -@@ -529,7 +531,7 @@ - 0x5EC6,0x5EC7,0x5EC8,0x5ECB,0x5ECC,0x5ECD,0x5ECE,0x5ECF,/* 0x40-0x47 */ - 0x5ED0,0x5ED4,0x5ED5,0x5ED7,0x5ED8,0x5ED9,0x5EDA,0x5EDC,/* 0x48-0x4F */ - 0x5EDD,0x5EDE,0x5EDF,0x5EE0,0x5EE1,0x5EE2,0x5EE3,0x5EE4,/* 0x50-0x57 */ -- 0x5EE5,0x5EE6,0x5EE7,0x5EE9,0x5EEB,0xF982,0x5EED,0x5EEE,/* 0x58-0x5F */ -+ 0x5EE5,0x5EE6,0x5EE7,0x5EE9,0x5EEB,0x5EEC,0x5EED,0x5EEE,/* 0x58-0x5F */ - 0x5EEF,0x5EF0,0x5EF1,0x5EF2,0x5EF3,0x5EF5,0x5EF8,0x5EF9,/* 0x60-0x67 */ - 0x5EFB,0x5EFC,0x5EFD,0x5F05,0x5F06,0x5F07,0x5F09,0x5F0C,/* 0x68-0x6F */ - 0x5F0D,0x5F0E,0x5F10,0x5F12,0x5F14,0x5F16,0x5F19,0x5F1A,/* 0x70-0x77 */ -@@ -544,7 +546,7 @@ - 0x5F74,0x5F75,0x5F76,0x5F78,0x5F7A,0x5F7D,0x5F7E,0x5F7F,/* 0xB0-0xB7 */ - 0x5F83,0x5F86,0x5F8D,0x5F8E,0x5F8F,0x5F91,0x5F93,0x5F94,/* 0xB8-0xBF */ - 0x5F96,0x5F9A,0x5F9B,0x5F9D,0x5F9E,0x5F9F,0x5FA0,0x5FA2,/* 0xC0-0xC7 */ -- 0x5FA3,0x5FA4,0x5FA5,0x5FA6,0x5FA7,0xF966,0x5FAB,0x5FAC,/* 0xC8-0xCF */ -+ 0x5FA3,0x5FA4,0x5FA5,0x5FA6,0x5FA7,0x5FA9,0x5FAB,0x5FAC,/* 0xC8-0xCF */ - 0x5FAF,0x5FB0,0x5FB1,0x5FB2,0x5FB3,0x5FB4,0x5FB6,0x5FB8,/* 0xD0-0xD7 */ - 0x5FB9,0x5FBA,0x5FBB,0x5FBE,0x5FBF,0x5FC0,0x5FC1,0x5FC2,/* 0xD8-0xDF */ - 0x5FC7,0x5FC8,0x5FCA,0x5FCB,0x5FCE,0x5FD3,0x5FD4,0x5FD5,/* 0xE0-0xE7 */ -@@ -578,7 +580,7 @@ - 0x60B9,0x60BA,0x60BD,0x60BE,0x60BF,0x60C0,0x60C1,0x60C2,/* 0xA0-0xA7 */ - 0x60C3,0x60C4,0x60C7,0x60C8,0x60C9,0x60CC,0x60CD,0x60CE,/* 0xA8-0xAF */ - 0x60CF,0x60D0,0x60D2,0x60D3,0x60D4,0x60D6,0x60D7,0x60D9,/* 0xB0-0xB7 */ -- 0x60DB,0x60DE,0xF9B9,0x60E2,0x60E3,0x60E4,0x60E5,0x60EA,/* 0xB8-0xBF */ -+ 0x60DB,0x60DE,0x60E1,0x60E2,0x60E3,0x60E4,0x60E5,0x60EA,/* 0xB8-0xBF */ - 0x60F1,0x60F2,0x60F5,0x60F7,0x60F8,0x60FB,0x60FC,0x60FD,/* 0xC0-0xC7 */ - 0x60FE,0x60FF,0x6102,0x6103,0x6104,0x6105,0x6107,0x610A,/* 0xC8-0xCF */ - 0x610B,0x610C,0x6110,0x6111,0x6112,0x6113,0x6114,0x6116,/* 0xD0-0xD7 */ -@@ -586,7 +588,7 @@ - 0x6122,0x6125,0x6128,0x6129,0x612A,0x612C,0x612D,0x612E,/* 0xE0-0xE7 */ - 0x612F,0x6130,0x6131,0x6132,0x6133,0x6134,0x6135,0x6136,/* 0xE8-0xEF */ - 0x6137,0x6138,0x6139,0x613A,0x613B,0x613C,0x613D,0x613E,/* 0xF0-0xF7 */ -- 0x6140,0x6141,0x6142,0x6143,0xF9D9,0x6145,0x6146,0x0000,/* 0xF8-0xFF */ -+ 0x6140,0x6141,0x6142,0x6143,0x6144,0x6145,0x6146,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_91[256] = { -@@ -605,7 +607,7 @@ - 0x6172,0x6173,0x6174,0x6176,0x6178,0x6179,0x617A,0x617B,/* 0x60-0x67 */ - 0x617C,0x617D,0x617E,0x617F,0x6180,0x6181,0x6182,0x6183,/* 0x68-0x6F */ - 0x6184,0x6185,0x6186,0x6187,0x6188,0x6189,0x618A,0x618C,/* 0x70-0x77 */ -- 0x618D,0x618F,0xF98F,0x6191,0x6192,0x6193,0x6195,0x0000,/* 0x78-0x7F */ -+ 0x618D,0x618F,0x6190,0x6191,0x6192,0x6193,0x6195,0x0000,/* 0x78-0x7F */ - - 0x6196,0x6197,0x6198,0x6199,0x619A,0x619B,0x619C,0x619E,/* 0x80-0x87 */ - 0x619F,0x61A0,0x61A1,0x61A2,0x61A3,0x61A4,0x61A5,0x61A6,/* 0x88-0x8F */ -@@ -617,8 +619,8 @@ - 0x61DC,0x61DD,0x61DE,0x61DF,0x61E0,0x61E1,0x61E2,0x61E3,/* 0xB8-0xBF */ - 0x61E4,0x61E5,0x61E7,0x61E8,0x61E9,0x61EA,0x61EB,0x61EC,/* 0xC0-0xC7 */ - 0x61ED,0x61EE,0x61EF,0x61F0,0x61F1,0x61F2,0x61F3,0x61F4,/* 0xC8-0xCF */ -- 0xF90D,0x61F7,0x61F8,0x61F9,0x61FA,0x61FB,0x61FC,0x61FD,/* 0xD0-0xD7 */ -- 0x61FE,0xF990,0x6201,0x6202,0x6203,0x6204,0x6205,0x6207,/* 0xD8-0xDF */ -+ 0x61F6,0x61F7,0x61F8,0x61F9,0x61FA,0x61FB,0x61FC,0x61FD,/* 0xD0-0xD7 */ -+ 0x61FE,0x6200,0x6201,0x6202,0x6203,0x6204,0x6205,0x6207,/* 0xD8-0xDF */ - 0x6209,0x6213,0x6214,0x6219,0x621C,0x621D,0x621E,0x6220,/* 0xE0-0xE7 */ - 0x6223,0x6226,0x6227,0x6228,0x6229,0x622B,0x622D,0x622F,/* 0xE8-0xEF */ - 0x6230,0x6231,0x6232,0x6235,0x6236,0x6238,0x6239,0x623A,/* 0xF0-0xF7 */ -@@ -643,7 +645,7 @@ - 0x62AA,0x62AD,0x62AE,0x62AF,0x62B0,0x62B2,0x62B3,0x62B4,/* 0x70-0x77 */ - 0x62B6,0x62B7,0x62B8,0x62BA,0x62BE,0x62C0,0x62C1,0x0000,/* 0x78-0x7F */ - -- 0x62C3,0x62CB,0xF95B,0x62D1,0x62D5,0x62DD,0x62DE,0x62E0,/* 0x80-0x87 */ -+ 0x62C3,0x62CB,0x62CF,0x62D1,0x62D5,0x62DD,0x62DE,0x62E0,/* 0x80-0x87 */ - 0x62E1,0x62E4,0x62EA,0x62EB,0x62F0,0x62F2,0x62F5,0x62F8,/* 0x88-0x8F */ - 0x62F9,0x62FA,0x62FB,0x6300,0x6303,0x6304,0x6305,0x6306,/* 0x90-0x97 */ - 0x630A,0x630B,0x630C,0x630D,0x630F,0x6310,0x6312,0x6313,/* 0x98-0x9F */ -@@ -689,10 +691,10 @@ - 0x6473,0x6474,0x6475,0x6476,0x6477,0x647B,0x647C,0x647D,/* 0xB8-0xBF */ - 0x647E,0x647F,0x6480,0x6481,0x6483,0x6486,0x6488,0x6489,/* 0xC0-0xC7 */ - 0x648A,0x648B,0x648C,0x648D,0x648E,0x648F,0x6490,0x6493,/* 0xC8-0xCF */ -- 0x6494,0x6497,0x6498,0xF991,0x649B,0x649C,0x649D,0x649F,/* 0xD0-0xD7 */ -+ 0x6494,0x6497,0x6498,0x649A,0x649B,0x649C,0x649D,0x649F,/* 0xD0-0xD7 */ - 0x64A0,0x64A1,0x64A2,0x64A3,0x64A5,0x64A6,0x64A7,0x64A8,/* 0xD8-0xDF */ - 0x64AA,0x64AB,0x64AF,0x64B1,0x64B2,0x64B3,0x64B4,0x64B6,/* 0xE0-0xE7 */ -- 0x64B9,0x64BB,0x64BD,0x64BE,0x64BF,0x64C1,0x64C3,0xF930,/* 0xE8-0xEF */ -+ 0x64B9,0x64BB,0x64BD,0x64BE,0x64BF,0x64C1,0x64C3,0x64C4,/* 0xE8-0xEF */ - 0x64C6,0x64C7,0x64C8,0x64C9,0x64CA,0x64CB,0x64CC,0x64CF,/* 0xF0-0xF7 */ - 0x64D1,0x64D3,0x64D4,0x64D5,0x64D6,0x64D9,0x64DA,0x0000,/* 0xF8-0xFF */ - }; -@@ -721,7 +723,7 @@ - 0x6547,0x654A,0x654B,0x654D,0x654E,0x6550,0x6552,0x6553,/* 0x98-0x9F */ - 0x6554,0x6557,0x6558,0x655A,0x655C,0x655F,0x6560,0x6561,/* 0xA0-0xA7 */ - 0x6564,0x6565,0x6567,0x6568,0x6569,0x656A,0x656D,0x656E,/* 0xA8-0xAF */ -- 0x656F,0x6571,0x6573,0x6575,0x6576,0xF969,0x6579,0x657A,/* 0xB0-0xB7 */ -+ 0x656F,0x6571,0x6573,0x6575,0x6576,0x6578,0x6579,0x657A,/* 0xB0-0xB7 */ - 0x657B,0x657C,0x657D,0x657E,0x657F,0x6580,0x6581,0x6582,/* 0xB8-0xBF */ - 0x6583,0x6584,0x6585,0x6586,0x6588,0x6589,0x658A,0x658D,/* 0xC0-0xC7 */ - 0x658E,0x658F,0x6592,0x6594,0x6595,0x6596,0x6598,0x659A,/* 0xC8-0xCF */ -@@ -754,14 +756,14 @@ - 0x6659,0x665B,0x665C,0x665D,0x665E,0x6660,0x6662,0x6663,/* 0x80-0x87 */ - 0x6665,0x6667,0x6669,0x666A,0x666B,0x666C,0x666D,0x6671,/* 0x88-0x8F */ - 0x6672,0x6673,0x6675,0x6678,0x6679,0x667B,0x667C,0x667D,/* 0x90-0x97 */ -- 0x667F,0x6680,0x6681,0x6683,0x6685,0x6686,0xF9C5,0x6689,/* 0x98-0x9F */ -+ 0x667F,0x6680,0x6681,0x6683,0x6685,0x6686,0x6688,0x6689,/* 0x98-0x9F */ - 0x668A,0x668B,0x668D,0x668E,0x668F,0x6690,0x6692,0x6693,/* 0xA0-0xA7 */ - 0x6694,0x6695,0x6698,0x6699,0x669A,0x669B,0x669C,0x669E,/* 0xA8-0xAF */ - 0x669F,0x66A0,0x66A1,0x66A2,0x66A3,0x66A4,0x66A5,0x66A6,/* 0xB0-0xB7 */ - 0x66A9,0x66AA,0x66AB,0x66AC,0x66AD,0x66AF,0x66B0,0x66B1,/* 0xB8-0xBF */ - 0x66B2,0x66B3,0x66B5,0x66B6,0x66B7,0x66B8,0x66BA,0x66BB,/* 0xC0-0xC7 */ - 0x66BC,0x66BD,0x66BF,0x66C0,0x66C1,0x66C2,0x66C3,0x66C4,/* 0xC8-0xCF */ -- 0x66C5,0xF98B,0x66C7,0x66C8,0x66C9,0x66CA,0x66CB,0x66CC,/* 0xD0-0xD7 */ -+ 0x66C5,0x66C6,0x66C7,0x66C8,0x66C9,0x66CA,0x66CB,0x66CC,/* 0xD0-0xD7 */ - 0x66CD,0x66CE,0x66CF,0x66D0,0x66D1,0x66D2,0x66D3,0x66D4,/* 0xD8-0xDF */ - 0x66D5,0x66D6,0x66D7,0x66D8,0x66DA,0x66DE,0x66DF,0x66E0,/* 0xE0-0xE7 */ - 0x66E1,0x66E2,0x66E3,0x66E4,0x66E5,0x66E7,0x66E8,0x66EA,/* 0xE8-0xEF */ -@@ -787,7 +789,7 @@ - 0x6759,0x675A,0x675B,0x675D,0x6762,0x6763,0x6764,0x6766,/* 0x70-0x77 */ - 0x6767,0x676B,0x676C,0x676E,0x6771,0x6774,0x6776,0x0000,/* 0x78-0x7F */ - -- 0x6778,0x6779,0x677A,0xF9C8,0x677D,0x6780,0x6782,0x6783,/* 0x80-0x87 */ -+ 0x6778,0x6779,0x677A,0x677B,0x677D,0x6780,0x6782,0x6783,/* 0x80-0x87 */ - 0x6785,0x6786,0x6788,0x678A,0x678C,0x678D,0x678E,0x678F,/* 0x88-0x8F */ - 0x6791,0x6792,0x6793,0x6794,0x6796,0x6799,0x679B,0x679F,/* 0x90-0x97 */ - 0x67A0,0x67A1,0x67A4,0x67A6,0x67A9,0x67AC,0x67AE,0x67B1,/* 0x98-0x9F */ -@@ -865,9 +867,9 @@ - 0x69DD,0x69DE,0x69E1,0x69E2,0x69E3,0x69E4,0x69E5,0x69E6,/* 0x98-0x9F */ - 0x69E7,0x69E8,0x69E9,0x69EA,0x69EB,0x69EC,0x69EE,0x69EF,/* 0xA0-0xA7 */ - 0x69F0,0x69F1,0x69F3,0x69F4,0x69F5,0x69F6,0x69F7,0x69F8,/* 0xA8-0xAF */ -- 0x69F9,0x69FA,0x69FB,0x69FC,0x69FE,0x6A00,0x6A01,0xF9BF,/* 0xB0-0xB7 */ -+ 0x69F9,0x69FA,0x69FB,0x69FC,0x69FE,0x6A00,0x6A01,0x6A02,/* 0xB0-0xB7 */ - 0x6A03,0x6A04,0x6A05,0x6A06,0x6A07,0x6A08,0x6A09,0x6A0B,/* 0xB8-0xBF */ -- 0x6A0C,0x6A0D,0x6A0E,0x6A0F,0x6A10,0x6A11,0x6A12,0xF94C,/* 0xC0-0xC7 */ -+ 0x6A0C,0x6A0D,0x6A0E,0x6A0F,0x6A10,0x6A11,0x6A12,0x6A13,/* 0xC0-0xC7 */ - 0x6A14,0x6A15,0x6A16,0x6A19,0x6A1A,0x6A1B,0x6A1C,0x6A1D,/* 0xC8-0xCF */ - 0x6A1E,0x6A20,0x6A22,0x6A23,0x6A24,0x6A25,0x6A26,0x6A27,/* 0xD0-0xD7 */ - 0x6A29,0x6A2B,0x6A2C,0x6A2D,0x6A2E,0x6A30,0x6A32,0x6A33,/* 0xD8-0xDF */ -@@ -900,13 +902,13 @@ - 0x6ABA,0x6ABB,0x6ABC,0x6ABD,0x6ABE,0x6ABF,0x6AC0,0x6AC1,/* 0x90-0x97 */ - 0x6AC2,0x6AC3,0x6AC4,0x6AC5,0x6AC6,0x6AC7,0x6AC8,0x6AC9,/* 0x98-0x9F */ - 0x6ACA,0x6ACB,0x6ACC,0x6ACD,0x6ACE,0x6ACF,0x6AD0,0x6AD1,/* 0xA0-0xA7 */ -- 0x6AD2,0xF931,0x6AD4,0x6AD5,0x6AD6,0x6AD7,0x6AD8,0x6AD9,/* 0xA8-0xAF */ -+ 0x6AD2,0x6AD3,0x6AD4,0x6AD5,0x6AD6,0x6AD7,0x6AD8,0x6AD9,/* 0xA8-0xAF */ - 0x6ADA,0x6ADB,0x6ADC,0x6ADD,0x6ADE,0x6ADF,0x6AE0,0x6AE1,/* 0xB0-0xB7 */ - 0x6AE2,0x6AE3,0x6AE4,0x6AE5,0x6AE6,0x6AE7,0x6AE8,0x6AE9,/* 0xB8-0xBF */ - 0x6AEA,0x6AEB,0x6AEC,0x6AED,0x6AEE,0x6AEF,0x6AF0,0x6AF1,/* 0xC0-0xC7 */ - 0x6AF2,0x6AF3,0x6AF4,0x6AF5,0x6AF6,0x6AF7,0x6AF8,0x6AF9,/* 0xC8-0xCF */ - 0x6AFA,0x6AFB,0x6AFC,0x6AFD,0x6AFE,0x6AFF,0x6B00,0x6B01,/* 0xD0-0xD7 */ -- 0x6B02,0x6B03,0xF91D,0x6B05,0x6B06,0x6B07,0x6B08,0x6B09,/* 0xD8-0xDF */ -+ 0x6B02,0x6B03,0x6B04,0x6B05,0x6B06,0x6B07,0x6B08,0x6B09,/* 0xD8-0xDF */ - 0x6B0A,0x6B0B,0x6B0C,0x6B0D,0x6B0E,0x6B0F,0x6B10,0x6B11,/* 0xE0-0xE7 */ - 0x6B12,0x6B13,0x6B14,0x6B15,0x6B16,0x6B17,0x6B18,0x6B19,/* 0xE8-0xEF */ - 0x6B1A,0x6B1B,0x6B1C,0x6B1D,0x6B1E,0x6B1F,0x6B25,0x6B26,/* 0xF0-0xF7 */ -@@ -928,14 +930,14 @@ - 0x6B51,0x6B52,0x6B53,0x6B54,0x6B55,0x6B56,0x6B57,0x6B58,/* 0x58-0x5F */ - 0x6B5A,0x6B5B,0x6B5C,0x6B5D,0x6B5E,0x6B5F,0x6B60,0x6B61,/* 0x60-0x67 */ - 0x6B68,0x6B69,0x6B6B,0x6B6C,0x6B6D,0x6B6E,0x6B6F,0x6B70,/* 0x68-0x6F */ -- 0x6B71,0x6B72,0x6B73,0x6B74,0x6B75,0x6B76,0xF98C,0x6B78,/* 0x70-0x77 */ -+ 0x6B71,0x6B72,0x6B73,0x6B74,0x6B75,0x6B76,0x6B77,0x6B78,/* 0x70-0x77 */ - 0x6B7A,0x6B7D,0x6B7E,0x6B7F,0x6B80,0x6B85,0x6B88,0x0000,/* 0x78-0x7F */ - - 0x6B8C,0x6B8E,0x6B8F,0x6B90,0x6B91,0x6B94,0x6B95,0x6B97,/* 0x80-0x87 */ - 0x6B98,0x6B99,0x6B9C,0x6B9D,0x6B9E,0x6B9F,0x6BA0,0x6BA2,/* 0x88-0x8F */ - 0x6BA3,0x6BA4,0x6BA5,0x6BA6,0x6BA7,0x6BA8,0x6BA9,0x6BAB,/* 0x90-0x97 */ -- 0x6BAC,0x6BAD,0xF9A5,0x6BAF,0x6BB0,0x6BB1,0x6BB2,0x6BB6,/* 0x98-0x9F */ -- 0x6BB8,0x6BB9,0xF970,0x6BBB,0x6BBC,0x6BBD,0x6BBE,0x6BC0,/* 0xA0-0xA7 */ -+ 0x6BAC,0x6BAD,0x6BAE,0x6BAF,0x6BB0,0x6BB1,0x6BB2,0x6BB6,/* 0x98-0x9F */ -+ 0x6BB8,0x6BB9,0x6BBA,0x6BBB,0x6BBC,0x6BBD,0x6BBE,0x6BC0,/* 0xA0-0xA7 */ - 0x6BC3,0x6BC4,0x6BC6,0x6BC7,0x6BC8,0x6BC9,0x6BCA,0x6BCC,/* 0xA8-0xAF */ - 0x6BCE,0x6BD0,0x6BD1,0x6BD8,0x6BDA,0x6BDC,0x6BDD,0x6BDE,/* 0xB0-0xB7 */ - 0x6BDF,0x6BE0,0x6BE2,0x6BE3,0x6BE4,0x6BE5,0x6BE6,0x6BE7,/* 0xB8-0xBF */ -@@ -995,8 +997,8 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x6DCD,0x6DCE,0x6DCF,0x6DD0,0x6DD2,0x6DD3,0x6DD4,0x6DD5,/* 0x40-0x47 */ -- 0x6DD7,0xF94D,0x6DDB,0x6DDC,0x6DDF,0x6DE2,0x6DE3,0x6DE5,/* 0x48-0x4F */ -- 0x6DE7,0x6DE8,0x6DE9,0xF9D6,0x6DED,0x6DEF,0x6DF0,0x6DF2,/* 0x50-0x57 */ -+ 0x6DD7,0x6DDA,0x6DDB,0x6DDC,0x6DDF,0x6DE2,0x6DE3,0x6DE5,/* 0x48-0x4F */ -+ 0x6DE7,0x6DE8,0x6DE9,0x6DEA,0x6DED,0x6DEF,0x6DF0,0x6DF2,/* 0x50-0x57 */ - 0x6DF4,0x6DF5,0x6DF6,0x6DF8,0x6DFA,0x6DFD,0x6DFE,0x6DFF,/* 0x58-0x5F */ - 0x6E00,0x6E01,0x6E02,0x6E03,0x6E04,0x6E06,0x6E07,0x6E08,/* 0x60-0x67 */ - 0x6E09,0x6E0B,0x6E0F,0x6E12,0x6E13,0x6E15,0x6E18,0x6E19,/* 0x68-0x6F */ -@@ -1035,7 +1037,7 @@ - 0x6F03,0x6F04,0x6F05,0x6F07,0x6F08,0x6F0A,0x6F0B,0x6F0C,/* 0x50-0x57 */ - 0x6F0D,0x6F0E,0x6F10,0x6F11,0x6F12,0x6F16,0x6F17,0x6F18,/* 0x58-0x5F */ - 0x6F19,0x6F1A,0x6F1B,0x6F1C,0x6F1D,0x6F1E,0x6F1F,0x6F21,/* 0x60-0x67 */ -- 0x6F22,0xF992,0x6F25,0x6F26,0x6F27,0x6F28,0x6F2C,0x6F2E,/* 0x68-0x6F */ -+ 0x6F22,0x6F23,0x6F25,0x6F26,0x6F27,0x6F28,0x6F2C,0x6F2E,/* 0x68-0x6F */ - 0x6F30,0x6F32,0x6F34,0x6F35,0x6F37,0x6F38,0x6F39,0x6F3A,/* 0x70-0x77 */ - 0x6F3B,0x6F3C,0x6F3D,0x6F3F,0x6F40,0x6F41,0x6F42,0x0000,/* 0x78-0x7F */ - -@@ -1066,9 +1068,9 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x6FE6,0x6FE7,0x6FE8,0x6FE9,0x6FEA,0xF922,0x6FEC,0x6FED,/* 0x40-0x47 */ -+ 0x6FE6,0x6FE7,0x6FE8,0x6FE9,0x6FEA,0x6FEB,0x6FEC,0x6FED,/* 0x40-0x47 */ - 0x6FF0,0x6FF1,0x6FF2,0x6FF3,0x6FF4,0x6FF5,0x6FF6,0x6FF7,/* 0x48-0x4F */ -- 0x6FF8,0x6FF9,0x6FFA,0x6FFB,0x6FFC,0x6FFD,0xF984,0x6FFF,/* 0x50-0x57 */ -+ 0x6FF8,0x6FF9,0x6FFA,0x6FFB,0x6FFC,0x6FFD,0x6FFE,0x6FFF,/* 0x50-0x57 */ - 0x7000,0x7001,0x7002,0x7003,0x7004,0x7005,0x7006,0x7007,/* 0x58-0x5F */ - 0x7008,0x7009,0x700A,0x700B,0x700C,0x700D,0x700E,0x700F,/* 0x60-0x67 */ - 0x7010,0x7012,0x7013,0x7014,0x7015,0x7016,0x7017,0x7018,/* 0x68-0x6F */ -@@ -1113,7 +1115,7 @@ - - 0x7135,0x7137,0x7138,0x7139,0x713A,0x713B,0x713C,0x713D,/* 0x80-0x87 */ - 0x713E,0x713F,0x7140,0x7141,0x7142,0x7143,0x7144,0x7146,/* 0x88-0x8F */ -- 0x7147,0x7148,0xF993,0x714B,0x714D,0x714F,0x7150,0x7151,/* 0x90-0x97 */ -+ 0x7147,0x7148,0x7149,0x714B,0x714D,0x714F,0x7150,0x7151,/* 0x90-0x97 */ - 0x7152,0x7153,0x7154,0x7155,0x7156,0x7157,0x7158,0x7159,/* 0x98-0x9F */ - 0x715A,0x715B,0x715D,0x715F,0x7160,0x7161,0x7162,0x7163,/* 0xA0-0xA7 */ - 0x7165,0x7169,0x716A,0x716B,0x716C,0x716D,0x716F,0x7170,/* 0xA8-0xAF */ -@@ -1126,7 +1128,7 @@ - 0x71B0,0x71B1,0x71B2,0x71B4,0x71B6,0x71B7,0x71B8,0x71BA,/* 0xE0-0xE7 */ - 0x71BB,0x71BC,0x71BD,0x71BE,0x71BF,0x71C0,0x71C1,0x71C2,/* 0xE8-0xEF */ - 0x71C4,0x71C5,0x71C6,0x71C7,0x71C8,0x71C9,0x71CA,0x71CB,/* 0xF0-0xF7 */ -- 0x71CC,0x71CD,0x71CF,0xF9EE,0x71D1,0x71D2,0x71D3,0x0000,/* 0xF8-0xFF */ -+ 0x71CC,0x71CD,0x71CF,0x71D0,0x71D1,0x71D2,0x71D3,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_A0[256] = { -@@ -1144,10 +1146,10 @@ - 0x71F2,0x71F3,0x71F4,0x71F5,0x71F6,0x71F7,0x71F8,0x71FA,/* 0x58-0x5F */ - 0x71FB,0x71FC,0x71FD,0x71FE,0x71FF,0x7200,0x7201,0x7202,/* 0x60-0x67 */ - 0x7203,0x7204,0x7205,0x7207,0x7208,0x7209,0x720A,0x720B,/* 0x68-0x6F */ -- 0x720C,0x720D,0x720E,0x720F,0xF932,0x7211,0x7212,0x7213,/* 0x70-0x77 */ -+ 0x720C,0x720D,0x720E,0x720F,0x7210,0x7211,0x7212,0x7213,/* 0x70-0x77 */ - 0x7214,0x7215,0x7216,0x7217,0x7218,0x7219,0x721A,0x0000,/* 0x78-0x7F */ - -- 0xF91E,0x721C,0x721E,0x721F,0x7220,0x7221,0x7222,0x7223,/* 0x80-0x87 */ -+ 0x721B,0x721C,0x721E,0x721F,0x7220,0x7221,0x7222,0x7223,/* 0x80-0x87 */ - 0x7224,0x7225,0x7226,0x7227,0x7229,0x722B,0x722D,0x722E,/* 0x88-0x8F */ - 0x722F,0x7232,0x7233,0x7234,0x723A,0x723C,0x723E,0x7240,/* 0x90-0x97 */ - 0x7241,0x7242,0x7243,0x7244,0x7245,0x7246,0x7249,0x724A,/* 0x98-0x9F */ -@@ -1160,7 +1162,7 @@ - 0x7298,0x7299,0x729A,0x729B,0x729C,0x729D,0x729E,0x72A0,/* 0xD0-0xD7 */ - 0x72A1,0x72A2,0x72A3,0x72A4,0x72A5,0x72A6,0x72A7,0x72A8,/* 0xD8-0xDF */ - 0x72A9,0x72AA,0x72AB,0x72AE,0x72B1,0x72B2,0x72B3,0x72B5,/* 0xE0-0xE7 */ -- 0x72BA,0x72BB,0x72BC,0x72BD,0x72BE,0x72BF,0xF9FA,0x72C5,/* 0xE8-0xEF */ -+ 0x72BA,0x72BB,0x72BC,0x72BD,0x72BE,0x72BF,0x72C0,0x72C5,/* 0xE8-0xEF */ - 0x72C6,0x72C7,0x72C9,0x72CA,0x72CB,0x72CC,0x72CF,0x72D1,/* 0xF0-0xF7 */ - 0x72D3,0x72D4,0x72D5,0x72D6,0x72D8,0x72DA,0x72DB,0x0000,/* 0xF8-0xFF */ - }; -@@ -1195,7 +1197,7 @@ - 0x222A,0x2229,0x2208,0x2237,0x221A,0x22A5,0x2225,0x2220,/* 0xC8-0xCF */ - 0x2312,0x2299,0x222B,0x222E,0x2261,0x224C,0x2248,0x223D,/* 0xD0-0xD7 */ - 0x221D,0x2260,0x226E,0x226F,0x2264,0x2265,0x221E,0x2235,/* 0xD8-0xDF */ -- 0x2234,0x2642,0x2640,0x2218,0x2032,0x2033,0x2103,0xFF04,/* 0xE0-0xE7 */ -+ 0x2234,0x2642,0x2640,0x00B0,0x2032,0x2033,0x2103,0xFF04,/* 0xE0-0xE7 */ - 0x00A4,0xFFE0,0xFFE1,0x2030,0x00A7,0x2116,0x2606,0x2605,/* 0xE8-0xEF */ - 0x25CB,0x25CF,0x25CE,0x25C7,0x25C6,0x25A1,0x25A0,0x25B3,/* 0xF0-0xF7 */ - 0x25B2,0x203B,0x2192,0x2190,0x2191,0x2193,0x3013,0x0000,/* 0xF8-0xFF */ -@@ -1515,7 +1517,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x7372,0x7373,0x7374,0xF9A7,0x7376,0x7377,0x7378,0x7379,/* 0x40-0x47 */ -+ 0x7372,0x7373,0x7374,0x7375,0x7376,0x7377,0x7378,0x7379,/* 0x40-0x47 */ - 0x737A,0x737B,0x737C,0x737D,0x737F,0x7380,0x7381,0x7382,/* 0x48-0x4F */ - 0x7383,0x7385,0x7386,0x7388,0x738A,0x738C,0x738D,0x738F,/* 0x50-0x57 */ - 0x7390,0x7392,0x7393,0x7394,0x7395,0x7397,0x7398,0x7399,/* 0x58-0x5F */ -@@ -1551,7 +1553,7 @@ - - 0x744E,0x744F,0x7450,0x7451,0x7452,0x7453,0x7454,0x7456,/* 0x80-0x87 */ - 0x7458,0x745D,0x7460,0x7461,0x7462,0x7463,0x7464,0x7465,/* 0x88-0x8F */ -- 0x7466,0x7467,0x7468,0xF9AE,0x746A,0x746B,0x746C,0x746E,/* 0x90-0x97 */ -+ 0x7466,0x7467,0x7468,0x7469,0x746A,0x746B,0x746C,0x746E,/* 0x90-0x97 */ - 0x746F,0x7471,0x7472,0x7473,0x7474,0x7475,0x7478,0x7479,/* 0x98-0x9F */ - 0x747A,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ - }; -@@ -1566,8 +1568,8 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x747B,0x747C,0x747D,0x747F,0x7482,0x7484,0x7485,0x7486,/* 0x40-0x47 */ -- 0x7488,0xF994,0x748A,0x748C,0x748D,0x748F,0x7491,0x7492,/* 0x48-0x4F */ -- 0x7493,0x7494,0x7495,0x7496,0x7497,0xF9EF,0x7499,0x749A,/* 0x50-0x57 */ -+ 0x7488,0x7489,0x748A,0x748C,0x748D,0x748F,0x7491,0x7492,/* 0x48-0x4F */ -+ 0x7493,0x7494,0x7495,0x7496,0x7497,0x7498,0x7499,0x749A,/* 0x50-0x57 */ - 0x749B,0x749D,0x749F,0x74A0,0x74A1,0x74A2,0x74A3,0x74A4,/* 0x58-0x5F */ - 0x74A5,0x74A6,0x74AA,0x74AB,0x74AC,0x74AD,0x74AE,0x74AF,/* 0x60-0x67 */ - 0x74B0,0x74B1,0x74B2,0x74B3,0x74B4,0x74B5,0x74B6,0x74B7,/* 0x68-0x6F */ -@@ -1601,7 +1603,7 @@ - - 0x755D,0x755E,0x755F,0x7560,0x7561,0x7562,0x7563,0x7564,/* 0x80-0x87 */ - 0x7567,0x7568,0x7569,0x756B,0x756C,0x756D,0x756E,0x756F,/* 0x88-0x8F */ -- 0xF962,0x7571,0x7573,0x7575,0x7576,0x7577,0x757A,0x757B,/* 0x90-0x97 */ -+ 0x7570,0x7571,0x7573,0x7575,0x7576,0x7577,0x757A,0x757B,/* 0x90-0x97 */ - 0x757C,0x757D,0x757E,0x7580,0x7581,0x7582,0x7584,0x7585,/* 0x98-0x9F */ - 0x7587,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ - }; -@@ -1627,7 +1629,7 @@ - 0x7608,0x7609,0x760B,0x760D,0x760E,0x760F,0x7611,0x7612,/* 0x80-0x87 */ - 0x7613,0x7614,0x7616,0x761A,0x761C,0x761D,0x761E,0x7621,/* 0x88-0x8F */ - 0x7623,0x7627,0x7628,0x762C,0x762E,0x762F,0x7631,0x7632,/* 0x90-0x97 */ -- 0x7636,0x7637,0x7639,0x763A,0x763B,0x763D,0x7641,0xF9C1,/* 0x98-0x9F */ -+ 0x7636,0x7637,0x7639,0x763A,0x763B,0x763D,0x7641,0x7642,/* 0x98-0x9F */ - 0x7644,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ - }; - -@@ -1643,7 +1645,7 @@ - 0x7645,0x7646,0x7647,0x7648,0x7649,0x764A,0x764B,0x764E,/* 0x40-0x47 */ - 0x764F,0x7650,0x7651,0x7652,0x7653,0x7655,0x7657,0x7658,/* 0x48-0x4F */ - 0x7659,0x765A,0x765B,0x765D,0x765F,0x7660,0x7661,0x7662,/* 0x50-0x57 */ -- 0x7664,0x7665,0x7666,0x7667,0x7668,0xF90E,0x766A,0x766C,/* 0x58-0x5F */ -+ 0x7664,0x7665,0x7666,0x7667,0x7668,0x7669,0x766A,0x766C,/* 0x58-0x5F */ - 0x766D,0x766E,0x7670,0x7671,0x7672,0x7673,0x7674,0x7675,/* 0x60-0x67 */ - 0x7676,0x7677,0x7679,0x767A,0x767C,0x767F,0x7680,0x7681,/* 0x68-0x6F */ - 0x7683,0x7685,0x7689,0x768A,0x768C,0x768D,0x768F,0x7690,/* 0x70-0x77 */ -@@ -1678,7 +1680,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x76C4,0x76C7,0x76C9,0x76CB,0x76CC,0x76D3,0x76D5,0x76D9,/* 0x40-0x47 */ - 0x76DA,0x76DC,0x76DD,0x76DE,0x76E0,0x76E1,0x76E2,0x76E3,/* 0x48-0x4F */ -- 0x76E4,0x76E6,0xF933,0x76E8,0x76E9,0x76EA,0x76EB,0x76EC,/* 0x50-0x57 */ -+ 0x76E4,0x76E6,0x76E7,0x76E8,0x76E9,0x76EA,0x76EB,0x76EC,/* 0x50-0x57 */ - 0x76ED,0x76F0,0x76F3,0x76F5,0x76F6,0x76F7,0x76FA,0x76FB,/* 0x58-0x5F */ - 0x76FD,0x76FF,0x7700,0x7702,0x7703,0x7705,0x7706,0x770A,/* 0x60-0x67 */ - 0x770C,0x770E,0x770F,0x7710,0x7711,0x7712,0x7713,0x7714,/* 0x68-0x6F */ -@@ -1690,14 +1692,14 @@ - 0x7748,0x7749,0x774A,0x774B,0x774C,0x774D,0x774E,0x774F,/* 0x90-0x97 */ - 0x7752,0x7753,0x7754,0x7755,0x7756,0x7757,0x7758,0x7759,/* 0x98-0x9F */ - 0x775C,0x8584,0x96F9,0x4FDD,0x5821,0x9971,0x5B9D,0x62B1,/* 0xA0-0xA7 */ -- 0x62A5,0xFA06,0x8C79,0x9C8D,0x7206,0x676F,0x7891,0x60B2,/* 0xA8-0xAF */ -- 0x5351,0xF963,0x8F88,0x80CC,0x8D1D,0x94A1,0x500D,0x72C8,/* 0xB0-0xB7 */ -+ 0x62A5,0x66B4,0x8C79,0x9C8D,0x7206,0x676F,0x7891,0x60B2,/* 0xA8-0xAF */ -+ 0x5351,0x5317,0x8F88,0x80CC,0x8D1D,0x94A1,0x500D,0x72C8,/* 0xB0-0xB7 */ - 0x5907,0x60EB,0x7119,0x88AB,0x5954,0x82EF,0x672C,0x7B28,/* 0xB8-0xBF */ - 0x5D29,0x7EF7,0x752D,0x6CF5,0x8E66,0x8FF8,0x903C,0x9F3B,/* 0xC0-0xC7 */ - 0x6BD4,0x9119,0x7B14,0x5F7C,0x78A7,0x84D6,0x853D,0x6BD5,/* 0xC8-0xCF */ - 0x6BD9,0x6BD6,0x5E01,0x5E87,0x75F9,0x95ED,0x655D,0x5F0A,/* 0xD0-0xD7 */ - 0x5FC5,0x8F9F,0x58C1,0x81C2,0x907F,0x965B,0x97AD,0x8FB9,/* 0xD8-0xDF */ -- 0x7F16,0x8D2C,0x6241,0xF965,0x53D8,0x535E,0x8FA8,0x8FA9,/* 0xE0-0xE7 */ -+ 0x7F16,0x8D2C,0x6241,0x4FBF,0x53D8,0x535E,0x8FA8,0x8FA9,/* 0xE0-0xE7 */ - 0x8FAB,0x904D,0x6807,0x5F6A,0x8198,0x8868,0x9CD6,0x618B,/* 0xE8-0xEF */ - 0x522B,0x762A,0x5F6C,0x658C,0x6FD2,0x6EE8,0x5BBE,0x6448,/* 0xF0-0xF7 */ - 0x5175,0x51B0,0x67C4,0x4E19,0x79C9,0x997C,0x70B3,0x0000,/* 0xF8-0xFF */ -@@ -1728,13 +1730,13 @@ - 0x77E4,0x75C5,0x5E76,0x73BB,0x83E0,0x64AD,0x62E8,0x94B5,/* 0xA0-0xA7 */ - 0x6CE2,0x535A,0x52C3,0x640F,0x94C2,0x7B94,0x4F2F,0x5E1B,/* 0xA8-0xAF */ - 0x8236,0x8116,0x818A,0x6E24,0x6CCA,0x9A73,0x6355,0x535C,/* 0xB0-0xB7 */ -- 0x54FA,0x8865,0x57E0,0xF967,0x5E03,0x6B65,0x7C3F,0x90E8,/* 0xB8-0xBF */ -+ 0x54FA,0x8865,0x57E0,0x4E0D,0x5E03,0x6B65,0x7C3F,0x90E8,/* 0xB8-0xBF */ - 0x6016,0x64E6,0x731C,0x88C1,0x6750,0x624D,0x8D22,0x776C,/* 0xC0-0xC7 */ - 0x8E29,0x91C7,0x5F69,0x83DC,0x8521,0x9910,0x53C2,0x8695,/* 0xC8-0xCF */ - 0x6B8B,0x60ED,0x60E8,0x707F,0x82CD,0x8231,0x4ED3,0x6CA7,/* 0xD0-0xD7 */ - 0x85CF,0x64CD,0x7CD9,0x69FD,0x66F9,0x8349,0x5395,0x7B56,/* 0xD8-0xDF */ - 0x4FA7,0x518C,0x6D4B,0x5C42,0x8E6D,0x63D2,0x53C9,0x832C,/* 0xE0-0xE7 */ -- 0xF9FE,0x67E5,0x78B4,0x643D,0x5BDF,0x5C94,0x5DEE,0x8BE7,/* 0xE8-0xEF */ -+ 0x8336,0x67E5,0x78B4,0x643D,0x5BDF,0x5C94,0x5DEE,0x8BE7,/* 0xE8-0xEF */ - 0x62C6,0x67F4,0x8C7A,0x6400,0x63BA,0x8749,0x998B,0x8C17,/* 0xF0-0xF7 */ - 0x7F20,0x94F2,0x4EA7,0x9610,0x98A4,0x660C,0x7316,0x0000,/* 0xF8-0xFF */ - }; -@@ -1764,7 +1766,7 @@ - 0x7883,0x573A,0x5C1D,0x5E38,0x957F,0x507F,0x80A0,0x5382,/* 0xA0-0xA7 */ - 0x655E,0x7545,0x5531,0x5021,0x8D85,0x6284,0x949E,0x671D,/* 0xA8-0xAF */ - 0x5632,0x6F6E,0x5DE2,0x5435,0x7092,0x8F66,0x626F,0x64A4,/* 0xB0-0xB7 */ -- 0x63A3,0x5F7B,0x6F88,0x90F4,0x81E3,0xF971,0x5C18,0x6668,/* 0xB8-0xBF */ -+ 0x63A3,0x5F7B,0x6F88,0x90F4,0x81E3,0x8FB0,0x5C18,0x6668,/* 0xB8-0xBF */ - 0x5FF1,0x6C89,0x9648,0x8D81,0x886C,0x6491,0x79F0,0x57CE,/* 0xC0-0xC7 */ - 0x6A59,0x6210,0x5448,0x4E58,0x7A0B,0x60E9,0x6F84,0x8BDA,/* 0xC8-0xCF */ - 0x627F,0x901E,0x9A8B,0x79E4,0x5403,0x75F4,0x6301,0x5319,/* 0xD0-0xD7 */ -@@ -1795,14 +1797,14 @@ - - 0x78E4,0x78E5,0x78E6,0x78E7,0x78E9,0x78EA,0x78EB,0x78ED,/* 0x80-0x87 */ - 0x78EE,0x78EF,0x78F0,0x78F1,0x78F3,0x78F5,0x78F6,0x78F8,/* 0x88-0x8F */ -- 0x78F9,0xF964,0x78FC,0x78FD,0x78FE,0x78FF,0x7900,0x7902,/* 0x90-0x97 */ -+ 0x78F9,0x78FB,0x78FC,0x78FD,0x78FE,0x78FF,0x7900,0x7902,/* 0x90-0x97 */ - 0x7903,0x7904,0x7906,0x7907,0x7908,0x7909,0x790A,0x790B,/* 0x98-0x9F */ - 0x790C,0x7840,0x50A8,0x77D7,0x6410,0x89E6,0x5904,0x63E3,/* 0xA0-0xA7 */ -- 0x5DDD,0x7A7F,0x693D,0x4F20,0x8239,0x5598,0xF905,0x75AE,/* 0xA8-0xAF */ -+ 0x5DDD,0x7A7F,0x693D,0x4F20,0x8239,0x5598,0x4E32,0x75AE,/* 0xA8-0xAF */ - 0x7A97,0x5E62,0x5E8A,0x95EF,0x521B,0x5439,0x708A,0x6376,/* 0xB0-0xB7 */ - 0x9524,0x5782,0x6625,0x693F,0x9187,0x5507,0x6DF3,0x7EAF,/* 0xB8-0xBF */ - 0x8822,0x6233,0x7EF0,0x75B5,0x8328,0x78C1,0x96CC,0x8F9E,/* 0xC0-0xC7 */ -- 0x6148,0x74F7,0x8BCD,0x6B64,0xF9FF,0x8D50,0x6B21,0x806A,/* 0xC8-0xCF */ -+ 0x6148,0x74F7,0x8BCD,0x6B64,0x523A,0x8D50,0x6B21,0x806A,/* 0xC8-0xCF */ - 0x8471,0x56F1,0x5306,0x4ECE,0x4E1B,0x51D1,0x7C97,0x918B,/* 0xD0-0xD7 */ - 0x7C07,0x4FC3,0x8E7F,0x7BE1,0x7A9C,0x6467,0x5D14,0x50AC,/* 0xD8-0xDF */ - 0x8106,0x7601,0x7CB9,0x6DEC,0x7FE0,0x6751,0x5B58,0x5BF8,/* 0xE0-0xE7 */ -@@ -1823,7 +1825,7 @@ - 0x790D,0x790E,0x790F,0x7910,0x7911,0x7912,0x7914,0x7915,/* 0x40-0x47 */ - 0x7916,0x7917,0x7918,0x7919,0x791A,0x791B,0x791C,0x791D,/* 0x48-0x4F */ - 0x791F,0x7920,0x7921,0x7922,0x7923,0x7925,0x7926,0x7927,/* 0x50-0x57 */ -- 0x7928,0x7929,0xF985,0x792B,0x792C,0x792D,0x792E,0x792F,/* 0x58-0x5F */ -+ 0x7928,0x7929,0x792A,0x792B,0x792C,0x792D,0x792E,0x792F,/* 0x58-0x5F */ - 0x7930,0x7931,0x7932,0x7933,0x7935,0x7936,0x7937,0x7938,/* 0x60-0x67 */ - 0x7939,0x793D,0x793F,0x7942,0x7943,0x7944,0x7945,0x7947,/* 0x68-0x6F */ - 0x794A,0x794B,0x794C,0x794D,0x794E,0x794F,0x7950,0x7951,/* 0x70-0x77 */ -@@ -1831,9 +1833,9 @@ - - 0x7964,0x7966,0x7969,0x796A,0x796B,0x796C,0x796E,0x7970,/* 0x80-0x87 */ - 0x7971,0x7972,0x7973,0x7974,0x7975,0x7976,0x7979,0x797B,/* 0x88-0x8F */ -- 0x797C,0x797D,0x797E,0xF93C,0x7982,0x7983,0x7986,0x7987,/* 0x90-0x97 */ -+ 0x797C,0x797D,0x797E,0x797F,0x7982,0x7983,0x7986,0x7987,/* 0x90-0x97 */ - 0x7988,0x7989,0x798B,0x798C,0x798D,0x798E,0x7990,0x7991,/* 0x98-0x9F */ -- 0x7992,0x6020,0x803D,0x62C5,0xF95E,0x5355,0x90F8,0x63B8,/* 0xA0-0xA7 */ -+ 0x7992,0x6020,0x803D,0x62C5,0x4E39,0x5355,0x90F8,0x63B8,/* 0xA0-0xA7 */ - 0x80C6,0x65E6,0x6C2E,0x4F46,0x60EE,0x6DE1,0x8BDE,0x5F39,/* 0xA8-0xAF */ - 0x86CB,0x5F53,0x6321,0x515A,0x8361,0x6863,0x5200,0x6363,/* 0xB0-0xB7 */ - 0x8E48,0x5012,0x5C9B,0x7977,0x5BFC,0x5230,0x7A3B,0x60BC,/* 0xB8-0xBF */ -@@ -1859,7 +1861,7 @@ - 0x7993,0x7994,0x7995,0x7996,0x7997,0x7998,0x7999,0x799B,/* 0x40-0x47 */ - 0x799C,0x799D,0x799E,0x799F,0x79A0,0x79A1,0x79A2,0x79A3,/* 0x48-0x4F */ - 0x79A4,0x79A5,0x79A6,0x79A8,0x79A9,0x79AA,0x79AB,0x79AC,/* 0x50-0x57 */ -- 0x79AD,0xF9B6,0x79AF,0x79B0,0x79B1,0x79B2,0x79B4,0x79B5,/* 0x58-0x5F */ -+ 0x79AD,0x79AE,0x79AF,0x79B0,0x79B1,0x79B2,0x79B4,0x79B5,/* 0x58-0x5F */ - 0x79B6,0x79B7,0x79B8,0x79BC,0x79BF,0x79C2,0x79C4,0x79C5,/* 0x60-0x67 */ - 0x79C7,0x79C8,0x79CA,0x79CC,0x79CE,0x79CF,0x79D0,0x79D3,/* 0x68-0x6F */ - 0x79D4,0x79D6,0x79D7,0x79D9,0x79DA,0x79DB,0x79DC,0x79DD,/* 0x70-0x77 */ -@@ -1869,12 +1871,12 @@ - 0x79F7,0x79F9,0x79FA,0x79FC,0x79FE,0x79FF,0x7A01,0x7A04,/* 0x88-0x8F */ - 0x7A05,0x7A07,0x7A08,0x7A09,0x7A0A,0x7A0C,0x7A0F,0x7A10,/* 0x90-0x97 */ - 0x7A11,0x7A12,0x7A13,0x7A15,0x7A16,0x7A18,0x7A19,0x7A1B,/* 0x98-0x9F */ -- 0xF956,0x4E01,0x76EF,0x53EE,0x9489,0x9876,0x9F0E,0x952D,/* 0xA0-0xA7 */ -+ 0x7A1C,0x4E01,0x76EF,0x53EE,0x9489,0x9876,0x9F0E,0x952D,/* 0xA0-0xA7 */ - 0x5B9A,0x8BA2,0x4E22,0x4E1C,0x51AC,0x8463,0x61C2,0x52A8,/* 0xA8-0xAF */ -- 0x680B,0x4F97,0x606B,0x51BB,0xFA05,0x515C,0x6296,0x6597,/* 0xB0-0xB7 */ -- 0x9661,0x8C46,0x9017,0x75D8,0xFA26,0x7763,0x6BD2,0x728A,/* 0xB8-0xBF */ -+ 0x680B,0x4F97,0x606B,0x51BB,0x6D1E,0x515C,0x6296,0x6597,/* 0xB0-0xB7 */ -+ 0x9661,0x8C46,0x9017,0x75D8,0x90FD,0x7763,0x6BD2,0x728A,/* 0xB8-0xBF */ - 0x72EC,0x8BFB,0x5835,0x7779,0x8D4C,0x675C,0x9540,0x809A,/* 0xC0-0xC7 */ -- 0xFA01,0x6E21,0x5992,0x7AEF,0x77ED,0x953B,0x6BB5,0x65AD,/* 0xC8-0xCF */ -+ 0x5EA6,0x6E21,0x5992,0x7AEF,0x77ED,0x953B,0x6BB5,0x65AD,/* 0xC8-0xCF */ - 0x7F0E,0x5806,0x5151,0x961F,0x5BF9,0x58A9,0x5428,0x8E72,/* 0xD0-0xD7 */ - 0x6566,0x987F,0x56E4,0x949D,0x76FE,0x9041,0x6387,0x54C6,/* 0xD8-0xDF */ - 0x591A,0x593A,0x579B,0x8EB2,0x6735,0x8DFA,0x8235,0x5241,/* 0xE0-0xE7 */ -@@ -1941,7 +1943,7 @@ - 0x7B00,0x7B01,0x7B02,0x7B05,0x7B07,0x7B09,0x7B0C,0x7B0D,/* 0x88-0x8F */ - 0x7B0E,0x7B10,0x7B12,0x7B13,0x7B16,0x7B17,0x7B18,0x7B1A,/* 0x90-0x97 */ - 0x7B1C,0x7B1D,0x7B1F,0x7B21,0x7B22,0x7B23,0x7B27,0x7B29,/* 0x98-0x9F */ -- 0x7B2D,0x6D6E,0x6DAA,0xFA1B,0x88B1,0x5F17,0x752B,0x629A,/* 0xA0-0xA7 */ -+ 0x7B2D,0x6D6E,0x6DAA,0x798F,0x88B1,0x5F17,0x752B,0x629A,/* 0xA0-0xA7 */ - 0x8F85,0x4FEF,0x91DC,0x65A7,0x812F,0x8151,0x5E9C,0x8150,/* 0xA8-0xAF */ - 0x8D74,0x526F,0x8986,0x8D4B,0x590D,0x5085,0x4ED8,0x961C,/* 0xB0-0xB7 */ - 0x7236,0x8179,0x8D1F,0x5BCC,0x8BA3,0x9644,0x5987,0x7F1A,/* 0xB8-0xBF */ -@@ -1952,7 +1954,7 @@ - 0x818F,0x7F94,0x7CD5,0x641E,0x9550,0x7A3F,0x544A,0x54E5,/* 0xE0-0xE7 */ - 0x6B4C,0x6401,0x6208,0x9E3D,0x80F3,0x7599,0x5272,0x9769,/* 0xE8-0xEF */ - 0x845B,0x683C,0x86E4,0x9601,0x9694,0x94EC,0x4E2A,0x5404,/* 0xF0-0xF7 */ -- 0x7ED9,0x6839,0x8DDF,0x8015,0xF901,0x5E9A,0x7FB9,0x0000,/* 0xF8-0xFF */ -+ 0x7ED9,0x6839,0x8DDF,0x8015,0x66F4,0x5E9A,0x7FB9,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_B9[256] = { -@@ -2012,7 +2014,7 @@ - 0x7C1A,0x7C1B,0x7C1C,0x7C1D,0x7C1E,0x7C20,0x7C21,0x7C22,/* 0x80-0x87 */ - 0x7C23,0x7C24,0x7C25,0x7C28,0x7C29,0x7C2B,0x7C2C,0x7C2D,/* 0x88-0x8F */ - 0x7C2E,0x7C2F,0x7C30,0x7C31,0x7C32,0x7C33,0x7C34,0x7C35,/* 0x90-0x97 */ -- 0x7C36,0x7C37,0x7C39,0x7C3A,0x7C3B,0x7C3C,0x7C3D,0xF9A6,/* 0x98-0x9F */ -+ 0x7C36,0x7C37,0x7C39,0x7C3A,0x7C3B,0x7C3C,0x7C3D,0x7C3E,/* 0x98-0x9F */ - 0x7C42,0x9AB8,0x5B69,0x6D77,0x6C26,0x4EA5,0x5BB3,0x9A87,/* 0xA0-0xA7 */ - 0x9163,0x61A8,0x90AF,0x97E9,0x542B,0x6DB5,0x5BD2,0x51FD,/* 0xA8-0xAF */ - 0x558A,0x7F55,0x7FF0,0x64BC,0x634D,0x65F1,0x61BE,0x608D,/* 0xB0-0xB7 */ -@@ -2039,7 +2041,7 @@ - 0x7C43,0x7C44,0x7C45,0x7C46,0x7C47,0x7C48,0x7C49,0x7C4A,/* 0x40-0x47 */ - 0x7C4B,0x7C4C,0x7C4E,0x7C4F,0x7C50,0x7C51,0x7C52,0x7C53,/* 0x48-0x4F */ - 0x7C54,0x7C55,0x7C56,0x7C57,0x7C58,0x7C59,0x7C5A,0x7C5B,/* 0x50-0x57 */ -- 0x7C5C,0x7C5D,0x7C5E,0x7C5F,0xF944,0x7C61,0x7C62,0x7C63,/* 0x58-0x5F */ -+ 0x7C5C,0x7C5D,0x7C5E,0x7C5F,0x7C60,0x7C61,0x7C62,0x7C63,/* 0x58-0x5F */ - 0x7C64,0x7C65,0x7C66,0x7C67,0x7C68,0x7C69,0x7C6A,0x7C6B,/* 0x60-0x67 */ - 0x7C6C,0x7C6D,0x7C6E,0x7C6F,0x7C70,0x7C71,0x7C72,0x7C75,/* 0x68-0x6F */ - 0x7C76,0x7C77,0x7C78,0x7C79,0x7C7A,0x7C7E,0x7C7F,0x7C80,/* 0x70-0x77 */ -@@ -2050,7 +2052,7 @@ - 0x7CA3,0x7CA6,0x7CA7,0x7CA8,0x7CA9,0x7CAB,0x7CAC,0x7CAD,/* 0x90-0x97 */ - 0x7CAF,0x7CB0,0x7CB4,0x7CB5,0x7CB6,0x7CB7,0x7CB8,0x7CBA,/* 0x98-0x9F */ - 0x7CBB,0x5F27,0x864E,0x552C,0x62A4,0x4E92,0x6CAA,0x6237,/* 0xA0-0xA7 */ -- 0x82B1,0x54D7,0x534E,0x733E,0xF904,0x753B,0x5212,0x5316,/* 0xA8-0xAF */ -+ 0x82B1,0x54D7,0x534E,0x733E,0x6ED1,0x753B,0x5212,0x5316,/* 0xA8-0xAF */ - 0x8BDD,0x69D0,0x5F8A,0x6000,0x6DEE,0x574F,0x6B22,0x73AF,/* 0xB0-0xB7 */ - 0x6853,0x8FD8,0x7F13,0x6362,0x60A3,0x5524,0x75EA,0x8C62,/* 0xB8-0xBF */ - 0x7115,0x6DA3,0x5BA6,0x5E7B,0x8352,0x614C,0x9EC4,0x78FA,/* 0xC0-0xC7 */ -@@ -2075,11 +2077,11 @@ - 0x7CBF,0x7CC0,0x7CC2,0x7CC3,0x7CC4,0x7CC6,0x7CC9,0x7CCB,/* 0x40-0x47 */ - 0x7CCE,0x7CCF,0x7CD0,0x7CD1,0x7CD2,0x7CD3,0x7CD4,0x7CD8,/* 0x48-0x4F */ - 0x7CDA,0x7CDB,0x7CDD,0x7CDE,0x7CE1,0x7CE2,0x7CE3,0x7CE4,/* 0x50-0x57 */ -- 0x7CE5,0x7CE6,0xF97B,0x7CE9,0x7CEA,0x7CEB,0x7CEC,0x7CED,/* 0x58-0x5F */ -+ 0x7CE5,0x7CE6,0x7CE7,0x7CE9,0x7CEA,0x7CEB,0x7CEC,0x7CED,/* 0x58-0x5F */ - 0x7CEE,0x7CF0,0x7CF1,0x7CF2,0x7CF3,0x7CF4,0x7CF5,0x7CF6,/* 0x60-0x67 */ - 0x7CF7,0x7CF9,0x7CFA,0x7CFC,0x7CFD,0x7CFE,0x7CFF,0x7D00,/* 0x68-0x6F */ - 0x7D01,0x7D02,0x7D03,0x7D04,0x7D05,0x7D06,0x7D07,0x7D08,/* 0x70-0x77 */ -- 0x7D09,0x7D0B,0x7D0C,0x7D0D,0x7D0E,0x7D0F,0xF9CF,0x0000,/* 0x78-0x7F */ -+ 0x7D09,0x7D0B,0x7D0C,0x7D0D,0x7D0E,0x7D0F,0x7D10,0x0000,/* 0x78-0x7F */ - - 0x7D11,0x7D12,0x7D13,0x7D14,0x7D15,0x7D16,0x7D17,0x7D18,/* 0x80-0x87 */ - 0x7D19,0x7D1A,0x7D1B,0x7D1C,0x7D1D,0x7D1E,0x7D1F,0x7D21,/* 0x88-0x8F */ -@@ -2123,7 +2125,7 @@ - 0x7D90,0x7D91,0x7D92,0x7D93,0x7D94,0x7D95,0x7D96,0x7D97,/* 0x98-0x9F */ - 0x7D98,0x5065,0x8230,0x5251,0x996F,0x6E10,0x6E85,0x6DA7,/* 0xA0-0xA7 */ - 0x5EFA,0x50F5,0x59DC,0x5C06,0x6D46,0x6C5F,0x7586,0x848B,/* 0xA8-0xAF */ -- 0x6868,0x5956,0x8BB2,0x5320,0x9171,0xFA09,0x8549,0x6912,/* 0xB0-0xB7 */ -+ 0x6868,0x5956,0x8BB2,0x5320,0x9171,0x964D,0x8549,0x6912,/* 0xB0-0xB7 */ - 0x7901,0x7126,0x80F6,0x4EA4,0x90CA,0x6D47,0x9A84,0x5A07,/* 0xB8-0xBF */ - 0x56BC,0x6405,0x94F0,0x77EB,0x4FA5,0x811A,0x72E1,0x89D2,/* 0xC0-0xC7 */ - 0x997A,0x7F34,0x7EDE,0x527F,0x6559,0x9175,0x8F7F,0x8F83,/* 0xC8-0xCF */ -@@ -2131,7 +2133,7 @@ - 0x622A,0x52AB,0x8282,0x6854,0x6770,0x6377,0x776B,0x7AED,/* 0xD8-0xDF */ - 0x6D01,0x7ED3,0x89E3,0x59D0,0x6212,0x85C9,0x82A5,0x754C,/* 0xE0-0xE7 */ - 0x501F,0x4ECB,0x75A5,0x8BEB,0x5C4A,0x5DFE,0x7B4B,0x65A4,/* 0xE8-0xEF */ -- 0xF90A,0x4ECA,0x6D25,0x895F,0x7D27,0x9526,0x4EC5,0x8C28,/* 0xF0-0xF7 */ -+ 0x91D1,0x4ECA,0x6D25,0x895F,0x7D27,0x9526,0x4EC5,0x8C28,/* 0xF0-0xF7 */ - 0x8FDB,0x9773,0x664B,0x7981,0x8FD1,0x70EC,0x6D78,0x0000,/* 0xF8-0xFF */ - }; - -@@ -2144,11 +2146,11 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x7D99,0x7D9A,0x7D9B,0x7D9C,0x7D9D,0x7D9E,0x7D9F,0xF93D,/* 0x40-0x47 */ -+ 0x7D99,0x7D9A,0x7D9B,0x7D9C,0x7D9D,0x7D9E,0x7D9F,0x7DA0,/* 0x40-0x47 */ - 0x7DA1,0x7DA2,0x7DA3,0x7DA4,0x7DA5,0x7DA7,0x7DA8,0x7DA9,/* 0x48-0x4F */ - 0x7DAA,0x7DAB,0x7DAC,0x7DAD,0x7DAF,0x7DB0,0x7DB1,0x7DB2,/* 0x50-0x57 */ - 0x7DB3,0x7DB4,0x7DB5,0x7DB6,0x7DB7,0x7DB8,0x7DB9,0x7DBA,/* 0x58-0x5F */ -- 0x7DBB,0x7DBC,0x7DBD,0xF957,0x7DBF,0x7DC0,0x7DC1,0x7DC2,/* 0x60-0x67 */ -+ 0x7DBB,0x7DBC,0x7DBD,0x7DBE,0x7DBF,0x7DC0,0x7DC1,0x7DC2,/* 0x60-0x67 */ - 0x7DC3,0x7DC4,0x7DC5,0x7DC6,0x7DC7,0x7DC8,0x7DC9,0x7DCA,/* 0x68-0x6F */ - 0x7DCB,0x7DCC,0x7DCD,0x7DCE,0x7DCF,0x7DD0,0x7DD1,0x7DD2,/* 0x70-0x77 */ - 0x7DD3,0x7DD4,0x7DD5,0x7DD6,0x7DD7,0x7DD8,0x7DD9,0x0000,/* 0x78-0x7F */ -@@ -2156,16 +2158,16 @@ - 0x7DDA,0x7DDB,0x7DDC,0x7DDD,0x7DDE,0x7DDF,0x7DE0,0x7DE1,/* 0x80-0x87 */ - 0x7DE2,0x7DE3,0x7DE4,0x7DE5,0x7DE6,0x7DE7,0x7DE8,0x7DE9,/* 0x88-0x8F */ - 0x7DEA,0x7DEB,0x7DEC,0x7DED,0x7DEE,0x7DEF,0x7DF0,0x7DF1,/* 0x90-0x97 */ -- 0x7DF2,0x7DF3,0xF996,0x7DF5,0x7DF6,0x7DF7,0x7DF8,0x7DF9,/* 0x98-0x9F */ -+ 0x7DF2,0x7DF3,0x7DF4,0x7DF5,0x7DF6,0x7DF7,0x7DF8,0x7DF9,/* 0x98-0x9F */ - 0x7DFA,0x5C3D,0x52B2,0x8346,0x5162,0x830E,0x775B,0x6676,/* 0xA0-0xA7 */ -- 0x9CB8,0x4EAC,0x60CA,0xFA1D,0x7CB3,0x7ECF,0x4E95,0x8B66,/* 0xA8-0xAF */ -+ 0x9CB8,0x4EAC,0x60CA,0x7CBE,0x7CB3,0x7ECF,0x4E95,0x8B66,/* 0xA8-0xAF */ - 0x666F,0x9888,0x9759,0x5883,0x656C,0x955C,0x5F84,0x75C9,/* 0xB0-0xB7 */ -- 0xFA1C,0x7ADF,0x7ADE,0x51C0,0x70AF,0x7A98,0x63EA,0x7A76,/* 0xB8-0xBF */ -+ 0x9756,0x7ADF,0x7ADE,0x51C0,0x70AF,0x7A98,0x63EA,0x7A76,/* 0xB8-0xBF */ - 0x7EA0,0x7396,0x97ED,0x4E45,0x7078,0x4E5D,0x9152,0x53A9,/* 0xC0-0xC7 */ - 0x6551,0x65E7,0x81FC,0x8205,0x548E,0x5C31,0x759A,0x97A0,/* 0xC8-0xCF */ - 0x62D8,0x72D9,0x75BD,0x5C45,0x9A79,0x83CA,0x5C40,0x5480,/* 0xD0-0xD7 */ - 0x77E9,0x4E3E,0x6CAE,0x805A,0x62D2,0x636E,0x5DE8,0x5177,/* 0xD8-0xDF */ -- 0x8DDD,0x8E1E,0x952F,0x4FF1,0xF906,0x60E7,0x70AC,0x5267,/* 0xE0-0xE7 */ -+ 0x8DDD,0x8E1E,0x952F,0x4FF1,0x53E5,0x60E7,0x70AC,0x5267,/* 0xE0-0xE7 */ - 0x6350,0x9E43,0x5A1F,0x5026,0x7737,0x5377,0x7EE2,0x6485,/* 0xE8-0xEF */ - 0x652B,0x6289,0x6398,0x5014,0x7235,0x89C9,0x51B3,0x8BC0,/* 0xF0-0xF7 */ - 0x7EDD,0x5747,0x83CC,0x94A7,0x519B,0x541B,0x5CFB,0x0000,/* 0xF8-0xFF */ -@@ -2187,7 +2189,7 @@ - 0x7E1B,0x7E1C,0x7E1D,0x7E1E,0x7E1F,0x7E20,0x7E21,0x7E22,/* 0x60-0x67 */ - 0x7E23,0x7E24,0x7E25,0x7E26,0x7E27,0x7E28,0x7E29,0x7E2A,/* 0x68-0x6F */ - 0x7E2B,0x7E2C,0x7E2D,0x7E2E,0x7E2F,0x7E30,0x7E31,0x7E32,/* 0x70-0x77 */ -- 0x7E33,0x7E34,0x7E35,0x7E36,0xF950,0x7E38,0x7E39,0x0000,/* 0x78-0x7F */ -+ 0x7E33,0x7E34,0x7E35,0x7E36,0x7E37,0x7E38,0x7E39,0x0000,/* 0x78-0x7F */ - - 0x7E3A,0x7E3C,0x7E3D,0x7E3E,0x7E3F,0x7E40,0x7E42,0x7E43,/* 0x80-0x87 */ - 0x7E44,0x7E45,0x7E46,0x7E48,0x7E49,0x7E4A,0x7E4B,0x7E4C,/* 0x88-0x8F */ -@@ -2230,17 +2232,17 @@ - 0x7F3E,0x7F3F,0x7F40,0x7F41,0x7F43,0x7F46,0x7F47,0x7F48,/* 0x90-0x97 */ - 0x7F49,0x7F4A,0x7F4B,0x7F4C,0x7F4D,0x7F4E,0x7F4F,0x7F52,/* 0x98-0x9F */ - 0x7F53,0x9988,0x6127,0x6E83,0x5764,0x6606,0x6346,0x56F0,/* 0xA0-0xA7 */ -- 0x62EC,0x6269,0xFA0B,0x9614,0x5783,0xF925,0xF90B,0x8721,/* 0xA8-0xAF */ -+ 0x62EC,0x6269,0x5ED3,0x9614,0x5783,0x62C9,0x5587,0x8721,/* 0xA8-0xAF */ - 0x814A,0x8FA3,0x5566,0x83B1,0x6765,0x8D56,0x84DD,0x5A6A,/* 0xB0-0xB7 */ - 0x680F,0x62E6,0x7BEE,0x9611,0x5170,0x6F9C,0x8C30,0x63FD,/* 0xB8-0xBF */ -- 0x89C8,0x61D2,0x7F06,0x70C2,0x6EE5,0x7405,0x6994,0xF92B,/* 0xC0-0xC7 */ -- 0xF928,0x90CE,0xF929,0xF92A,0x635E,0x52B3,0xF946,0xF934,/* 0xC8-0xCF */ -- 0x4F6C,0x59E5,0xF919,0xF916,0x6D9D,0xF952,0x4E50,0xF949,/* 0xD0-0xD7 */ -- 0x956D,0x857E,0xF947,0xF94F,0x5121,0x5792,0x64C2,0xF953,/* 0xD8-0xDF */ -- 0x7C7B,0x6CEA,0x68F1,0x695E,0xF92E,0x5398,0xF9E2,0x7281,/* 0xE0-0xE7 */ -- 0xF989,0x7BF1,0x72F8,0x79BB,0x6F13,0xF9E4,0xF9E1,0xF9E9,/* 0xE8-0xEF */ -- 0x9CA4,0x793C,0x8389,0x8354,0xF9DE,0xF9DA,0x4E3D,0x5389,/* 0xF0-0xF7 */ -- 0x52B1,0x783E,0x5386,0xF9DD,0x5088,0xF9B5,0x4FD0,0x0000,/* 0xF8-0xFF */ -+ 0x89C8,0x61D2,0x7F06,0x70C2,0x6EE5,0x7405,0x6994,0x72FC,/* 0xC0-0xC7 */ -+ 0x5ECA,0x90CE,0x6717,0x6D6A,0x635E,0x52B3,0x7262,0x8001,/* 0xC8-0xCF */ -+ 0x4F6C,0x59E5,0x916A,0x70D9,0x6D9D,0x52D2,0x4E50,0x96F7,/* 0xD0-0xD7 */ -+ 0x956D,0x857E,0x78CA,0x7D2F,0x5121,0x5792,0x64C2,0x808B,/* 0xD8-0xDF */ -+ 0x7C7B,0x6CEA,0x68F1,0x695E,0x51B7,0x5398,0x68A8,0x7281,/* 0xE0-0xE7 */ -+ 0x9ECE,0x7BF1,0x72F8,0x79BB,0x6F13,0x7406,0x674E,0x91CC,/* 0xE8-0xEF */ -+ 0x9CA4,0x793C,0x8389,0x8354,0x540F,0x6817,0x4E3D,0x5389,/* 0xF0-0xF7 */ -+ 0x52B1,0x783E,0x5386,0x5229,0x5088,0x4F8B,0x4FD0,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C1[256] = { -@@ -2255,7 +2257,7 @@ - 0x7F56,0x7F59,0x7F5B,0x7F5C,0x7F5D,0x7F5E,0x7F60,0x7F63,/* 0x40-0x47 */ - 0x7F64,0x7F65,0x7F66,0x7F67,0x7F6B,0x7F6C,0x7F6D,0x7F6F,/* 0x48-0x4F */ - 0x7F70,0x7F73,0x7F75,0x7F76,0x7F77,0x7F78,0x7F7A,0x7F7B,/* 0x50-0x57 */ -- 0x7F7C,0x7F7D,0x7F7F,0x7F80,0x7F82,0x7F83,0x7F84,0xF90F,/* 0x58-0x5F */ -+ 0x7F7C,0x7F7D,0x7F7F,0x7F80,0x7F82,0x7F83,0x7F84,0x7F85,/* 0x58-0x5F */ - 0x7F86,0x7F87,0x7F88,0x7F89,0x7F8B,0x7F8D,0x7F8F,0x7F90,/* 0x60-0x67 */ - 0x7F91,0x7F92,0x7F93,0x7F95,0x7F96,0x7F97,0x7F98,0x7F99,/* 0x68-0x6F */ - 0x7F9B,0x7F9C,0x7FA0,0x7FA2,0x7FA3,0x7FA5,0x7FA6,0x7FA8,/* 0x70-0x77 */ -@@ -2265,18 +2267,18 @@ - 0x7FC0,0x7FC2,0x7FC3,0x7FC4,0x7FC6,0x7FC7,0x7FC8,0x7FC9,/* 0x88-0x8F */ - 0x7FCB,0x7FCD,0x7FCF,0x7FD0,0x7FD1,0x7FD2,0x7FD3,0x7FD6,/* 0x90-0x97 */ - 0x7FD7,0x7FD9,0x7FDA,0x7FDB,0x7FDC,0x7FDD,0x7FDE,0x7FE2,/* 0x98-0x9F */ -- 0x7FE3,0xF9E5,0xF9F7,0xF9F9,0x6CA5,0x96B6,0xF98A,0x7483,/* 0xA0-0xA7 */ -- 0x54E9,0x4FE9,0x8054,0x83B2,0x8FDE,0x9570,0xF9A2,0xF9AC,/* 0xA8-0xAF */ -+ 0x7FE3,0x75E2,0x7ACB,0x7C92,0x6CA5,0x96B6,0x529B,0x7483,/* 0xA0-0xA7 */ -+ 0x54E9,0x4FE9,0x8054,0x83B2,0x8FDE,0x9570,0x5EC9,0x601C,/* 0xA8-0xAF */ - 0x6D9F,0x5E18,0x655B,0x8138,0x94FE,0x604B,0x70BC,0x7EC3,/* 0xB0-0xB7 */ -- 0x7CAE,0x51C9,0xF97A,0x7CB1,0xF97C,0x4E24,0x8F86,0xF97E,/* 0xB8-0xBF */ -- 0x667E,0xF977,0x8C05,0x64A9,0x804A,0xF9BB,0x7597,0xF9C0,/* 0xC0-0xC7 */ -- 0x5BE5,0x8FBD,0x6F66,0xF9BA,0x6482,0x9563,0x5ED6,0xF9BE,/* 0xC8-0xCF */ -- 0xF99C,0xF9A0,0xF99F,0xF99D,0x730E,0x7433,0xF9F4,0x78F7,/* 0xD0-0xD7 */ -- 0x9716,0x4E34,0x90BB,0x9CDE,0xF9F5,0x51DB,0x8D41,0xF9ED,/* 0xD8-0xDF */ -- 0x62CE,0xF9AD,0xF958,0xF9B2,0x9F84,0x94C3,0x4F36,0xF9AF,/* 0xE0-0xE7 */ -- 0xF955,0x7075,0xF959,0x5CAD,0x9886,0x53E6,0xF9A8,0xF9CB,/* 0xE8-0xEF */ -- 0xF9CC,0x69B4,0xF9CE,0x998F,0xF9CD,0x5218,0x7624,0xF9CA,/* 0xF0-0xF7 */ -- 0xF9C9,0xF9D1,0x9F99,0x804B,0x5499,0x7B3C,0x7ABF,0x0000,/* 0xF8-0xFF */ -+ 0x7CAE,0x51C9,0x6881,0x7CB1,0x826F,0x4E24,0x8F86,0x91CF,/* 0xB8-0xBF */ -+ 0x667E,0x4EAE,0x8C05,0x64A9,0x804A,0x50DA,0x7597,0x71CE,/* 0xC0-0xC7 */ -+ 0x5BE5,0x8FBD,0x6F66,0x4E86,0x6482,0x9563,0x5ED6,0x6599,/* 0xC8-0xCF */ -+ 0x5217,0x88C2,0x70C8,0x52A3,0x730E,0x7433,0x6797,0x78F7,/* 0xD0-0xD7 */ -+ 0x9716,0x4E34,0x90BB,0x9CDE,0x6DCB,0x51DB,0x8D41,0x541D,/* 0xD8-0xDF */ -+ 0x62CE,0x73B2,0x83F1,0x96F6,0x9F84,0x94C3,0x4F36,0x7F9A,/* 0xE0-0xE7 */ -+ 0x51CC,0x7075,0x9675,0x5CAD,0x9886,0x53E6,0x4EE4,0x6E9C,/* 0xE8-0xEF */ -+ 0x7409,0x69B4,0x786B,0x998F,0x7559,0x5218,0x7624,0x6D41,/* 0xF0-0xF7 */ -+ 0x67F3,0x516D,0x9F99,0x804B,0x5499,0x7B3C,0x7ABF,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C2[256] = { -@@ -2299,17 +2301,17 @@ - - 0x8059,0x805B,0x805C,0x805D,0x805E,0x805F,0x8060,0x8061,/* 0x80-0x87 */ - 0x8062,0x8063,0x8064,0x8065,0x8066,0x8067,0x8068,0x806B,/* 0x88-0x8F */ -- 0x806C,0x806D,0x806E,0xF997,0x8070,0x8072,0x8073,0x8074,/* 0x90-0x97 */ -+ 0x806C,0x806D,0x806E,0x806F,0x8070,0x8072,0x8073,0x8074,/* 0x90-0x97 */ - 0x8075,0x8076,0x8077,0x8078,0x8079,0x807A,0x807B,0x807C,/* 0x98-0x9F */ -- 0x807D,0xF9DC,0x5784,0x62E2,0x9647,0x697C,0x5A04,0x6402,/* 0xA0-0xA7 */ -- 0x7BD3,0xF94E,0xF951,0x82A6,0x5362,0x9885,0x5E90,0x7089,/* 0xA8-0xAF */ -- 0x63B3,0x5364,0x864F,0x9C81,0x9E93,0xF93B,0xF938,0xF937,/* 0xB0-0xB7 */ -- 0x8D42,0xF940,0x6F5E,0x7984,0x5F55,0x9646,0xF9D2,0x9A74,/* 0xB8-0xBF */ -- 0x5415,0x94DD,0x4FA3,0xF983,0xF9DF,0x5C61,0x7F15,0x8651,/* 0xC0-0xC7 */ -- 0x6C2F,0xF9D8,0xF9DB,0x6EE4,0x7EFF,0x5CE6,0x631B,0x5B6A,/* 0xC8-0xCF */ -- 0x6EE6,0xF91C,0x4E71,0xF975,0xF976,0x62A1,0x8F6E,0x4F26,/* 0xD0-0xD7 */ -- 0x4ED1,0x6CA6,0x7EB6,0x8BBA,0x841D,0xF911,0x7F57,0x903B,/* 0xD8-0xDF */ -- 0x9523,0x7BA9,0x9AA1,0xF912,0xF918,0xF915,0x9A86,0x7EDC,/* 0xE0-0xE7 */ -+ 0x807D,0x9686,0x5784,0x62E2,0x9647,0x697C,0x5A04,0x6402,/* 0xA0-0xA7 */ -+ 0x7BD3,0x6F0F,0x964B,0x82A6,0x5362,0x9885,0x5E90,0x7089,/* 0xA8-0xAF */ -+ 0x63B3,0x5364,0x864F,0x9C81,0x9E93,0x788C,0x9732,0x8DEF,/* 0xB0-0xB7 */ -+ 0x8D42,0x9E7F,0x6F5E,0x7984,0x5F55,0x9646,0x622E,0x9A74,/* 0xB8-0xBF */ -+ 0x5415,0x94DD,0x4FA3,0x65C5,0x5C65,0x5C61,0x7F15,0x8651,/* 0xC0-0xC7 */ -+ 0x6C2F,0x5F8B,0x7387,0x6EE4,0x7EFF,0x5CE6,0x631B,0x5B6A,/* 0xC8-0xCF */ -+ 0x6EE6,0x5375,0x4E71,0x63A0,0x7565,0x62A1,0x8F6E,0x4F26,/* 0xD0-0xD7 */ -+ 0x4ED1,0x6CA6,0x7EB6,0x8BBA,0x841D,0x87BA,0x7F57,0x903B,/* 0xD8-0xDF */ -+ 0x9523,0x7BA9,0x9AA1,0x88F8,0x843D,0x6D1B,0x9A86,0x7EDC,/* 0xE0-0xE7 */ - 0x5988,0x9EBB,0x739B,0x7801,0x8682,0x9A6C,0x9A82,0x561B,/* 0xE8-0xEF */ - 0x5417,0x57CB,0x4E70,0x9EA6,0x5356,0x8FC8,0x8109,0x7792,/* 0xF0-0xF7 */ - 0x9992,0x86EE,0x6EE1,0x8513,0x66FC,0x6162,0x6F2B,0x0000,/* 0xF8-0xFF */ -@@ -2324,7 +2326,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0xF945,0x8081,0x8082,0x8085,0x8088,0x808A,0x808D,0x808E,/* 0x40-0x47 */ -+ 0x807E,0x8081,0x8082,0x8085,0x8088,0x808A,0x808D,0x808E,/* 0x40-0x47 */ - 0x808F,0x8090,0x8091,0x8092,0x8094,0x8095,0x8097,0x8099,/* 0x48-0x4F */ - 0x809E,0x80A3,0x80A6,0x80A7,0x80A8,0x80AC,0x80B0,0x80B3,/* 0x50-0x57 */ - 0x80B5,0x80B6,0x80B8,0x80B9,0x80BB,0x80C5,0x80C7,0x80C8,/* 0x58-0x5F */ -@@ -2344,7 +2346,7 @@ - 0x7F8E,0x6627,0x5BD0,0x59B9,0x5A9A,0x95E8,0x95F7,0x4EEC,/* 0xC0-0xC7 */ - 0x840C,0x8499,0x6AAC,0x76DF,0x9530,0x731B,0x68A6,0x5B5F,/* 0xC8-0xCF */ - 0x772F,0x919A,0x9761,0x7CDC,0x8FF7,0x8C1C,0x5F25,0x7C73,/* 0xD0-0xD7 */ -- 0x79D8,0x89C5,0xF968,0x871C,0x5BC6,0x5E42,0x68C9,0x7720,/* 0xD8-0xDF */ -+ 0x79D8,0x89C5,0x6CCC,0x871C,0x5BC6,0x5E42,0x68C9,0x7720,/* 0xD8-0xDF */ - 0x7EF5,0x5195,0x514D,0x52C9,0x5A29,0x7F05,0x9762,0x82D7,/* 0xE0-0xE7 */ - 0x63CF,0x7784,0x85D0,0x79D2,0x6E3A,0x5E99,0x5999,0x8511,/* 0xE8-0xEF */ - 0x706D,0x6C11,0x62BF,0x76BF,0x654F,0x60AF,0x95FD,0x660E,/* 0xF0-0xF7 */ -@@ -2378,12 +2380,12 @@ - 0x964C,0x8C0B,0x725F,0x67D0,0x62C7,0x7261,0x4EA9,0x59C6,/* 0xB0-0xB7 */ - 0x6BCD,0x5893,0x66AE,0x5E55,0x52DF,0x6155,0x6728,0x76EE,/* 0xB8-0xBF */ - 0x7766,0x7267,0x7A46,0x62FF,0x54EA,0x5450,0x94A0,0x90A3,/* 0xC0-0xC7 */ -- 0x5A1C,0x7EB3,0x6C16,0x4E43,0x5976,0x8010,0xF90C,0x5357,/* 0xC8-0xCF */ -+ 0x5A1C,0x7EB3,0x6C16,0x4E43,0x5976,0x8010,0x5948,0x5357,/* 0xC8-0xCF */ - 0x7537,0x96BE,0x56CA,0x6320,0x8111,0x607C,0x95F9,0x6DD6,/* 0xD0-0xD7 */ - 0x5462,0x9981,0x5185,0x5AE9,0x80FD,0x59AE,0x9713,0x502A,/* 0xD8-0xDF */ -- 0xF9E3,0x5C3C,0x62DF,0x4F60,0xF9EB,0x817B,0x9006,0xF9EC,/* 0xE0-0xE7 */ -- 0x852B,0x62C8,0xF98E,0x78BE,0x64B5,0xF9A4,0xF9A3,0x5A18,/* 0xE8-0xEF */ -- 0x917F,0x9E1F,0xF9BD,0x634F,0x8042,0x5B7D,0x556E,0x954A,/* 0xF0-0xF7 */ -+ 0x6CE5,0x5C3C,0x62DF,0x4F60,0x533F,0x817B,0x9006,0x6EBA,/* 0xE0-0xE7 */ -+ 0x852B,0x62C8,0x5E74,0x78BE,0x64B5,0x637B,0x5FF5,0x5A18,/* 0xE8-0xEF */ -+ 0x917F,0x9E1F,0x5C3F,0x634F,0x8042,0x5B7D,0x556E,0x954A,/* 0xF0-0xF7 */ - 0x954D,0x6D85,0x60A8,0x67E0,0x72DE,0x51DD,0x5B81,0x0000,/* 0xF8-0xFF */ - }; - -@@ -2396,9 +2398,9 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x81D4,0x81D5,0x81D6,0x81D7,0xF926,0x81D9,0x81DA,0x81DB,/* 0x40-0x47 */ -+ 0x81D4,0x81D5,0x81D6,0x81D7,0x81D8,0x81D9,0x81DA,0x81DB,/* 0x40-0x47 */ - 0x81DC,0x81DD,0x81DE,0x81DF,0x81E0,0x81E1,0x81E2,0x81E4,/* 0x48-0x4F */ -- 0x81E5,0x81E6,0xF9F6,0x81E9,0x81EB,0x81EE,0x81EF,0x81F0,/* 0x50-0x57 */ -+ 0x81E5,0x81E6,0x81E8,0x81E9,0x81EB,0x81EE,0x81EF,0x81F0,/* 0x50-0x57 */ - 0x81F1,0x81F2,0x81F5,0x81F6,0x81F7,0x81F8,0x81F9,0x81FA,/* 0x58-0x5F */ - 0x81FD,0x81FF,0x8203,0x8207,0x8208,0x8209,0x820A,0x820B,/* 0x60-0x67 */ - 0x820E,0x820F,0x8211,0x8213,0x8215,0x8216,0x8217,0x8218,/* 0x68-0x6F */ -@@ -2410,7 +2412,7 @@ - 0x8255,0x8256,0x8257,0x8259,0x825B,0x825C,0x825D,0x825E,/* 0x90-0x97 */ - 0x8260,0x8261,0x8262,0x8263,0x8264,0x8265,0x8266,0x8267,/* 0x98-0x9F */ - 0x8269,0x62E7,0x6CDE,0x725B,0x626D,0x94AE,0x7EBD,0x8113,/* 0xA0-0xA7 */ -- 0x6D53,0x519C,0xF943,0x5974,0x52AA,0xF960,0xF981,0x6696,/* 0xA8-0xAF */ -+ 0x6D53,0x519C,0x5F04,0x5974,0x52AA,0x6012,0x5973,0x6696,/* 0xA8-0xAF */ - 0x8650,0x759F,0x632A,0x61E6,0x7CEF,0x8BFA,0x54E6,0x6B27,/* 0xB0-0xB7 */ - 0x9E25,0x6BB4,0x85D5,0x5455,0x5076,0x6CA4,0x556A,0x8DB4,/* 0xB8-0xBF */ - 0x722C,0x5E15,0x6015,0x7436,0x62CD,0x6392,0x724C,0x5F98,/* 0xC0-0xC7 */ -@@ -2455,7 +2457,7 @@ - 0x66DD,0x7011,0x671F,0x6B3A,0x6816,0x621A,0x59BB,0x4E03,/* 0xD8-0xDF */ - 0x51C4,0x6F06,0x67D2,0x6C8F,0x5176,0x68CB,0x5947,0x6B67,/* 0xE0-0xE7 */ - 0x7566,0x5D0E,0x8110,0x9F50,0x65D7,0x7948,0x7941,0x9A91,/* 0xE8-0xEF */ -- 0x8D77,0x5C82,0x4E5E,0x4F01,0x542F,0xF909,0x780C,0x5668,/* 0xF0-0xF7 */ -+ 0x8D77,0x5C82,0x4E5E,0x4F01,0x542F,0x5951,0x780C,0x5668,/* 0xF0-0xF7 */ - 0x6C14,0x8FC4,0x5F03,0x6C7D,0x6CE3,0x8BAB,0x6390,0x0000,/* 0xF8-0xFF */ - }; - -@@ -2478,7 +2480,7 @@ - 0x83A4,0x83A5,0x83A6,0x83A7,0x83AC,0x83AD,0x83AE,0x0000,/* 0x78-0x7F */ - - 0x83AF,0x83B5,0x83BB,0x83BE,0x83BF,0x83C2,0x83C3,0x83C4,/* 0x80-0x87 */ -- 0x83C6,0x83C8,0xF93E,0x83CB,0x83CD,0x83CE,0x83D0,0x83D1,/* 0x88-0x8F */ -+ 0x83C6,0x83C8,0x83C9,0x83CB,0x83CD,0x83CE,0x83D0,0x83D1,/* 0x88-0x8F */ - 0x83D2,0x83D3,0x83D5,0x83D7,0x83D9,0x83DA,0x83DB,0x83DE,/* 0x90-0x97 */ - 0x83E2,0x83E3,0x83E4,0x83E6,0x83E7,0x83E8,0x83EB,0x83EC,/* 0x98-0x9F */ - 0x83ED,0x6070,0x6D3D,0x7275,0x6266,0x948E,0x94C5,0x5343,/* 0xA0-0xA7 */ -@@ -2487,9 +2489,9 @@ - 0x6B49,0x67AA,0x545B,0x8154,0x7F8C,0x5899,0x8537,0x5F3A,/* 0xB8-0xBF */ - 0x62A2,0x6A47,0x9539,0x6572,0x6084,0x6865,0x77A7,0x4E54,/* 0xC0-0xC7 */ - 0x4FA8,0x5DE7,0x9798,0x64AC,0x7FD8,0x5CED,0x4FCF,0x7A8D,/* 0xC8-0xCF */ -- 0xFA00,0x8304,0x4E14,0x602F,0x7A83,0x94A6,0x4FB5,0x4EB2,/* 0xD0-0xD7 */ -+ 0x5207,0x8304,0x4E14,0x602F,0x7A83,0x94A6,0x4FB5,0x4EB2,/* 0xD0-0xD7 */ - 0x79E6,0x7434,0x52E4,0x82B9,0x64D2,0x79BD,0x5BDD,0x6C81,/* 0xD8-0xDF */ -- 0x9752,0x8F7B,0x6C22,0x503E,0x537F,0x6E05,0x64CE,0xFA12,/* 0xE0-0xE7 */ -+ 0x9752,0x8F7B,0x6C22,0x503E,0x537F,0x6E05,0x64CE,0x6674,/* 0xE0-0xE7 */ - 0x6C30,0x60C5,0x9877,0x8BF7,0x5E86,0x743C,0x7A77,0x79CB,/* 0xE8-0xEF */ - 0x4E18,0x90B1,0x7403,0x6C42,0x56DA,0x914B,0x6CC5,0x8D8B,/* 0xF0-0xF7 */ - 0x533A,0x86C6,0x66F2,0x8EAF,0x5C48,0x9A71,0x6E20,0x0000,/* 0xF8-0xFF */ -@@ -2511,7 +2513,7 @@ - 0x8421,0x8422,0x8423,0x8429,0x842A,0x842B,0x842C,0x842D,/* 0x60-0x67 */ - 0x842E,0x842F,0x8430,0x8432,0x8433,0x8434,0x8435,0x8436,/* 0x68-0x6F */ - 0x8437,0x8439,0x843A,0x843B,0x843E,0x843F,0x8440,0x8441,/* 0x70-0x77 */ -- 0x8442,0x8443,0x8444,0x8445,0x8447,0x8448,0xF96E,0x0000,/* 0x78-0x7F */ -+ 0x8442,0x8443,0x8444,0x8445,0x8447,0x8448,0x8449,0x0000,/* 0x78-0x7F */ - - 0x844A,0x844B,0x844C,0x844D,0x844E,0x844F,0x8450,0x8452,/* 0x80-0x87 */ - 0x8453,0x8454,0x8455,0x8456,0x8458,0x845D,0x845E,0x845F,/* 0x88-0x8F */ -@@ -2526,9 +2528,9 @@ - 0x5203,0x598A,0x7EAB,0x6254,0x4ECD,0x65E5,0x620E,0x8338,/* 0xD0-0xD7 */ - 0x84C9,0x8363,0x878D,0x7194,0x6EB6,0x5BB9,0x7ED2,0x5197,/* 0xD8-0xDF */ - 0x63C9,0x67D4,0x8089,0x8339,0x8815,0x5112,0x5B7A,0x5982,/* 0xE0-0xE7 */ -- 0x8FB1,0x4E73,0x6C5D,0x5165,0x8925,0x8F6F,0xF9C6,0x854A,/* 0xE8-0xEF */ -- 0x745E,0x9510,0x95F0,0x6DA6,0xF974,0x5F31,0x6492,0x6D12,/* 0xF0-0xF7 */ -- 0x8428,0x816E,0x9CC3,0xF96C,0x8D5B,0x4E09,0x53C1,0x0000,/* 0xF8-0xFF */ -+ 0x8FB1,0x4E73,0x6C5D,0x5165,0x8925,0x8F6F,0x962E,0x854A,/* 0xE8-0xEF */ -+ 0x745E,0x9510,0x95F0,0x6DA6,0x82E5,0x5F31,0x6492,0x6D12,/* 0xF0-0xF7 */ -+ 0x8428,0x816E,0x9CC3,0x585E,0x8D5B,0x4E09,0x53C1,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C9[256] = { -@@ -2550,7 +2552,7 @@ - 0x84CC,0x84CE,0x84CF,0x84D2,0x84D4,0x84D5,0x84D7,0x0000,/* 0x78-0x7F */ - - 0x84D8,0x84D9,0x84DA,0x84DB,0x84DC,0x84DE,0x84E1,0x84E2,/* 0x80-0x87 */ -- 0x84E4,0x84E7,0x84E8,0x84E9,0x84EA,0x84EB,0x84ED,0xF999,/* 0x88-0x8F */ -+ 0x84E4,0x84E7,0x84E8,0x84E9,0x84EA,0x84EB,0x84ED,0x84EE,/* 0x88-0x8F */ - 0x84EF,0x84F1,0x84F2,0x84F3,0x84F4,0x84F5,0x84F6,0x84F7,/* 0x90-0x97 */ - 0x84F8,0x84F9,0x84FA,0x84FB,0x84FD,0x84FE,0x8500,0x8501,/* 0x98-0x9F */ - 0x8502,0x4F1E,0x6563,0x6851,0x55D3,0x4E27,0x6414,0x9A9A,/* 0xA0-0xA7 */ -@@ -2563,7 +2565,7 @@ - 0x97F6,0x5C11,0x54E8,0x90B5,0x7ECD,0x5962,0x8D4A,0x86C7,/* 0xD8-0xDF */ - 0x820C,0x820D,0x8D66,0x6444,0x5C04,0x6151,0x6D89,0x793E,/* 0xE0-0xE7 */ - 0x8BBE,0x7837,0x7533,0x547B,0x4F38,0x8EAB,0x6DF1,0x5A20,/* 0xE8-0xEF */ -- 0x7EC5,0xFA19,0xF972,0x5BA1,0x5A76,0x751A,0x80BE,0x614E,/* 0xF0-0xF7 */ -+ 0x7EC5,0x795E,0x6C88,0x5BA1,0x5A76,0x751A,0x80BE,0x614E,/* 0xF0-0xF7 */ - 0x6E17,0x58F0,0x751F,0x7525,0x7272,0x5347,0x7EF3,0x0000,/* 0xF8-0xFF */ - }; - -@@ -2589,9 +2591,9 @@ - 0x8561,0x8562,0x8563,0x8565,0x8566,0x8567,0x8569,0x856A,/* 0x88-0x8F */ - 0x856B,0x856C,0x856D,0x856E,0x856F,0x8570,0x8571,0x8573,/* 0x90-0x97 */ - 0x8575,0x8576,0x8577,0x8578,0x857C,0x857D,0x857F,0x8580,/* 0x98-0x9F */ -- 0x8581,0xF96D,0x76DB,0x5269,0x80DC,0x5723,0x5E08,0x5931,/* 0xA0-0xA7 */ -+ 0x8581,0x7701,0x76DB,0x5269,0x80DC,0x5723,0x5E08,0x5931,/* 0xA0-0xA7 */ - 0x72EE,0x65BD,0x6E7F,0x8BD7,0x5C38,0x8671,0x5341,0x77F3,/* 0xA8-0xAF */ -- 0xF973,0x65F6,0xF9FD,0x98DF,0x8680,0x5B9E,0x8BC6,0x53F2,/* 0xB0-0xB7 */ -+ 0x62FE,0x65F6,0x4EC0,0x98DF,0x8680,0x5B9E,0x8BC6,0x53F2,/* 0xB0-0xB7 */ - 0x77E2,0x4F7F,0x5C4E,0x9A76,0x59CB,0x5F0F,0x793A,0x58EB,/* 0xB8-0xBF */ - 0x4E16,0x67FF,0x4E8B,0x62ED,0x8A93,0x901D,0x52BF,0x662F,/* 0xC0-0xC7 */ - 0x55DC,0x566C,0x9002,0x4ED5,0x4F8D,0x91CA,0x9970,0x6C0F,/* 0xC8-0xCF */ -@@ -2619,7 +2621,7 @@ - 0x85AB,0x85AC,0x85AD,0x85B1,0x85B2,0x85B3,0x85B4,0x85B5,/* 0x60-0x67 */ - 0x85B6,0x85B8,0x85BA,0x85BB,0x85BC,0x85BD,0x85BE,0x85BF,/* 0x68-0x6F */ - 0x85C0,0x85C2,0x85C3,0x85C4,0x85C5,0x85C6,0x85C7,0x85C8,/* 0x70-0x77 */ -- 0x85CA,0x85CB,0x85CC,0xF923,0x85CE,0x85D1,0x85D2,0x0000,/* 0x78-0x7F */ -+ 0x85CA,0x85CB,0x85CC,0x85CD,0x85CE,0x85D1,0x85D2,0x0000,/* 0x78-0x7F */ - - 0x85D4,0x85D6,0x85D7,0x85D8,0x85D9,0x85DA,0x85DB,0x85DD,/* 0x80-0x87 */ - 0x85DE,0x85DF,0x85E0,0x85E1,0x85E2,0x85E3,0x85E5,0x85E6,/* 0x88-0x8F */ -@@ -2635,7 +2637,7 @@ - 0x7D20,0x901F,0x7C9F,0x50F3,0x5851,0x6EAF,0x5BBF,0x8BC9,/* 0xD8-0xDF */ - 0x8083,0x9178,0x849C,0x7B97,0x867D,0x968B,0x968F,0x7EE5,/* 0xE0-0xE7 */ - 0x9AD3,0x788E,0x5C81,0x7A57,0x9042,0x96A7,0x795F,0x5B59,/* 0xE8-0xEF */ -- 0x635F,0x7B0B,0x84D1,0x68AD,0x5506,0x7F29,0x7410,0xF96A,/* 0xF0-0xF7 */ -+ 0x635F,0x7B0B,0x84D1,0x68AD,0x5506,0x7F29,0x7410,0x7D22,/* 0xF0-0xF7 */ - 0x9501,0x6240,0x584C,0x4ED6,0x5B83,0x5979,0x5854,0x0000,/* 0xF8-0xFF */ - }; - -@@ -2648,24 +2650,24 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x85F9,0xF9F0,0x85FC,0x85FD,0x85FE,0x8600,0x8601,0x8602,/* 0x40-0x47 */ -- 0x8603,0x8604,0xF935,0x8607,0x8608,0x8609,0x860A,0x860B,/* 0x48-0x4F */ -+ 0x85F9,0x85FA,0x85FC,0x85FD,0x85FE,0x8600,0x8601,0x8602,/* 0x40-0x47 */ -+ 0x8603,0x8604,0x8606,0x8607,0x8608,0x8609,0x860A,0x860B,/* 0x48-0x4F */ - 0x860C,0x860D,0x860E,0x860F,0x8610,0x8612,0x8613,0x8614,/* 0x50-0x57 */ - 0x8615,0x8617,0x8618,0x8619,0x861A,0x861B,0x861C,0x861D,/* 0x58-0x5F */ - 0x861E,0x861F,0x8620,0x8621,0x8622,0x8623,0x8624,0x8625,/* 0x60-0x67 */ -- 0x8626,0x8628,0x862A,0x862B,0x862C,0xF91F,0x862E,0x862F,/* 0x68-0x6F */ -+ 0x8626,0x8628,0x862A,0x862B,0x862C,0x862D,0x862E,0x862F,/* 0x68-0x6F */ - 0x8630,0x8631,0x8632,0x8633,0x8634,0x8635,0x8636,0x8637,/* 0x70-0x77 */ -- 0x8639,0x863A,0x863B,0x863D,0x863E,0xF910,0x8640,0x0000,/* 0x78-0x7F */ -+ 0x8639,0x863A,0x863B,0x863D,0x863E,0x863F,0x8640,0x0000,/* 0x78-0x7F */ - - 0x8641,0x8642,0x8643,0x8644,0x8645,0x8646,0x8647,0x8648,/* 0x80-0x87 */ - 0x8649,0x864A,0x864B,0x864C,0x8652,0x8653,0x8655,0x8656,/* 0x88-0x8F */ -- 0x8657,0x8658,0x8659,0x865B,0xF936,0x865D,0x865F,0x8660,/* 0x90-0x97 */ -+ 0x8657,0x8658,0x8659,0x865B,0x865C,0x865D,0x865F,0x8660,/* 0x90-0x97 */ - 0x8661,0x8663,0x8664,0x8665,0x8666,0x8667,0x8668,0x8669,/* 0x98-0x9F */ - 0x866A,0x736D,0x631E,0x8E4B,0x8E0F,0x80CE,0x82D4,0x62AC,/* 0xA0-0xA7 */ - 0x53F0,0x6CF0,0x915E,0x592A,0x6001,0x6C70,0x574D,0x644A,/* 0xA8-0xAF */ - 0x8D2A,0x762B,0x6EE9,0x575B,0x6A80,0x75F0,0x6F6D,0x8C2D,/* 0xB0-0xB7 */ - 0x8C08,0x5766,0x6BEF,0x8892,0x78B3,0x63A2,0x53F9,0x70AD,/* 0xB8-0xBF */ -- 0x6C64,0x5858,0x642A,0x5802,0x68E0,0x819B,0x5510,0xFA03,/* 0xC0-0xC7 */ -+ 0x6C64,0x5858,0x642A,0x5802,0x68E0,0x819B,0x5510,0x7CD6,/* 0xC0-0xC7 */ - 0x5018,0x8EBA,0x6DCC,0x8D9F,0x70EB,0x638F,0x6D9B,0x6ED4,/* 0xC8-0xCF */ - 0x7EE6,0x8404,0x6843,0x9003,0x6DD8,0x9676,0x8BA8,0x5957,/* 0xD0-0xD7 */ - 0x7279,0x85E4,0x817E,0x75BC,0x8A8A,0x68AF,0x5254,0x8E22,/* 0xD8-0xDF */ -@@ -2704,7 +2706,7 @@ - 0x5C60,0x571F,0x5410,0x5154,0x6E4D,0x56E2,0x63A8,0x9893,/* 0xC0-0xC7 */ - 0x817F,0x8715,0x892A,0x9000,0x541E,0x5C6F,0x81C0,0x62D6,/* 0xC8-0xCF */ - 0x6258,0x8131,0x9E35,0x9640,0x9A6E,0x9A7C,0x692D,0x59A5,/* 0xD0-0xD7 */ -- 0xFA02,0x553E,0x6316,0x54C7,0x86D9,0x6D3C,0x5A03,0x74E6,/* 0xD8-0xDF */ -+ 0x62D3,0x553E,0x6316,0x54C7,0x86D9,0x6D3C,0x5A03,0x74E6,/* 0xD8-0xDF */ - 0x889C,0x6B6A,0x5916,0x8C4C,0x5F2F,0x6E7E,0x73A9,0x987D,/* 0xE0-0xE7 */ - 0x4E38,0x70F7,0x5B8C,0x7897,0x633D,0x665A,0x7696,0x60CB,/* 0xE8-0xEF */ - 0x5B9B,0x5A49,0x4E07,0x8155,0x6C6A,0x738B,0x4EA1,0x6789,/* 0xF0-0xF7 */ -@@ -2768,7 +2770,7 @@ - 0x87FA,0x87FB,0x87FC,0x87FD,0x87FF,0x8800,0x8801,0x8802,/* 0x80-0x87 */ - 0x8804,0x8805,0x8806,0x8807,0x8808,0x8809,0x880B,0x880C,/* 0x88-0x8F */ - 0x880D,0x880E,0x880F,0x8810,0x8811,0x8812,0x8814,0x8817,/* 0x90-0x97 */ -- 0x8818,0x8819,0x881A,0x881C,0x881D,0x881E,0xF927,0x8820,/* 0x98-0x9F */ -+ 0x8818,0x8819,0x881A,0x881C,0x881D,0x881E,0x881F,0x8820,/* 0x98-0x9F */ - 0x8823,0x7A00,0x606F,0x5E0C,0x6089,0x819D,0x5915,0x60DC,/* 0xA0-0xA7 */ - 0x7184,0x70EF,0x6EAA,0x6C50,0x7280,0x6A84,0x88AD,0x5E2D,/* 0xA8-0xAF */ - 0x4E60,0x5AB3,0x559C,0x94E3,0x6D17,0x7CFB,0x9699,0x620F,/* 0xB0-0xB7 */ -@@ -2778,7 +2780,7 @@ - 0x95F2,0x6D8E,0x5F26,0x5ACC,0x663E,0x9669,0x73B0,0x732E,/* 0xD0-0xD7 */ - 0x53BF,0x817A,0x9985,0x7FA1,0x5BAA,0x9677,0x9650,0x7EBF,/* 0xD8-0xDF */ - 0x76F8,0x53A2,0x9576,0x9999,0x7BB1,0x8944,0x6E58,0x4E61,/* 0xE0-0xE7 */ -- 0x7FD4,0xFA1A,0x8BE6,0x60F3,0x54CD,0x4EAB,0x9879,0x5DF7,/* 0xE8-0xEF */ -+ 0x7FD4,0x7965,0x8BE6,0x60F3,0x54CD,0x4EAB,0x9879,0x5DF7,/* 0xE8-0xEF */ - 0x6A61,0x50CF,0x5411,0x8C61,0x8427,0x785D,0x9704,0x524A,/* 0xF0-0xF7 */ - 0x54EE,0x56A3,0x9500,0x6D88,0x5BB5,0x6DC6,0x6653,0x0000,/* 0xF8-0xFF */ - }; -@@ -2811,7 +2813,7 @@ - 0x61C8,0x6CC4,0x6CFB,0x8C22,0x5C51,0x85AA,0x82AF,0x950C,/* 0xB8-0xBF */ - 0x6B23,0x8F9B,0x65B0,0x5FFB,0x5FC3,0x4FE1,0x8845,0x661F,/* 0xC0-0xC7 */ - 0x8165,0x7329,0x60FA,0x5174,0x5211,0x578B,0x5F62,0x90A2,/* 0xC8-0xCF */ -- 0xFA08,0x9192,0x5E78,0x674F,0x6027,0x59D3,0x5144,0x51F6,/* 0xD0-0xD7 */ -+ 0x884C,0x9192,0x5E78,0x674F,0x6027,0x59D3,0x5144,0x51F6,/* 0xD0-0xD7 */ - 0x80F8,0x5308,0x6C79,0x96C4,0x718A,0x4F11,0x4FEE,0x7F9E,/* 0xD8-0xDF */ - 0x673D,0x55C5,0x9508,0x79C0,0x8896,0x7EE3,0x589F,0x620C,/* 0xE0-0xE7 */ - 0x9700,0x865A,0x5618,0x987B,0x5F90,0x8BB8,0x84C4,0x9157,/* 0xE8-0xEF */ -@@ -2832,7 +2834,7 @@ - 0x88B6,0x88B8,0x88B9,0x88BA,0x88BB,0x88BD,0x88BE,0x88BF,/* 0x48-0x4F */ - 0x88C0,0x88C3,0x88C4,0x88C7,0x88C8,0x88CA,0x88CB,0x88CC,/* 0x50-0x57 */ - 0x88CD,0x88CF,0x88D0,0x88D1,0x88D3,0x88D6,0x88D7,0x88DA,/* 0x58-0x5F */ -- 0x88DB,0x88DC,0x88DD,0x88DE,0x88E0,0xF9E8,0x88E6,0x88E7,/* 0x60-0x67 */ -+ 0x88DB,0x88DC,0x88DD,0x88DE,0x88E0,0x88E1,0x88E6,0x88E7,/* 0x60-0x67 */ - 0x88E9,0x88EA,0x88EB,0x88EC,0x88ED,0x88EE,0x88EF,0x88F2,/* 0x68-0x6F */ - 0x88F5,0x88F6,0x88F7,0x88FA,0x88FB,0x88FD,0x88FF,0x8900,/* 0x70-0x77 */ - 0x8901,0x8903,0x8904,0x8905,0x8906,0x8907,0x8908,0x0000,/* 0x78-0x7F */ -@@ -2846,7 +2848,7 @@ - 0x5BFB,0x9A6F,0x5DE1,0x6B89,0x6C5B,0x8BAD,0x8BAF,0x900A,/* 0xB0-0xB7 */ - 0x8FC5,0x538B,0x62BC,0x9E26,0x9E2D,0x5440,0x4E2B,0x82BD,/* 0xB8-0xBF */ - 0x7259,0x869C,0x5D16,0x8859,0x6DAF,0x96C5,0x54D1,0x4E9A,/* 0xC0-0xC7 */ -- 0x8BB6,0x7109,0xF99E,0x9609,0x70DF,0x6DF9,0x76D0,0x4E25,/* 0xC8-0xCF */ -+ 0x8BB6,0x7109,0x54BD,0x9609,0x70DF,0x6DF9,0x76D0,0x4E25,/* 0xC8-0xCF */ - 0x7814,0x8712,0x5CA9,0x5EF6,0x8A00,0x989C,0x960E,0x708E,/* 0xD0-0xD7 */ - 0x6CBF,0x5944,0x63A9,0x773C,0x884D,0x6F14,0x8273,0x5830,/* 0xD8-0xDF */ - 0x71D5,0x538C,0x781A,0x96C1,0x5501,0x5F66,0x7130,0x5BB4,/* 0xE0-0xE7 */ -@@ -2869,12 +2871,12 @@ - 0x894A,0x894B,0x894C,0x894D,0x894E,0x894F,0x8950,0x8951,/* 0x50-0x57 */ - 0x8952,0x8953,0x8954,0x8955,0x8956,0x8957,0x8958,0x8959,/* 0x58-0x5F */ - 0x895A,0x895B,0x895C,0x895D,0x8960,0x8961,0x8962,0x8963,/* 0x60-0x67 */ -- 0xF924,0x8965,0x8967,0x8968,0x8969,0x896A,0x896B,0x896C,/* 0x68-0x6F */ -+ 0x8964,0x8965,0x8967,0x8968,0x8969,0x896A,0x896B,0x896C,/* 0x68-0x6F */ - 0x896D,0x896E,0x896F,0x8970,0x8971,0x8972,0x8973,0x8974,/* 0x70-0x77 */ - 0x8975,0x8976,0x8977,0x8978,0x8979,0x897A,0x897C,0x0000,/* 0x78-0x7F */ - - 0x897D,0x897E,0x8980,0x8982,0x8984,0x8985,0x8987,0x8988,/* 0x80-0x87 */ -- 0x8989,0x898A,0xFA0A,0x898C,0x898D,0x898E,0x898F,0x8990,/* 0x88-0x8F */ -+ 0x8989,0x898A,0x898B,0x898C,0x898D,0x898E,0x898F,0x8990,/* 0x88-0x8F */ - 0x8991,0x8992,0x8993,0x8994,0x8995,0x8996,0x8997,0x8998,/* 0x90-0x97 */ - 0x8999,0x899A,0x899B,0x899C,0x899D,0x899E,0x899F,0x89A0,/* 0x98-0x9F */ - 0x89A1,0x6447,0x5C27,0x9065,0x7A91,0x8C23,0x59DA,0x54AC,/* 0xA0-0xA7 */ -@@ -2883,9 +2885,9 @@ - 0x814B,0x591C,0x6DB2,0x4E00,0x58F9,0x533B,0x63D6,0x94F1,/* 0xB8-0xBF */ - 0x4F9D,0x4F0A,0x8863,0x9890,0x5937,0x9057,0x79FB,0x4EEA,/* 0xC0-0xC7 */ - 0x80F0,0x7591,0x6C82,0x5B9C,0x59E8,0x5F5D,0x6905,0x8681,/* 0xC8-0xCF */ -- 0x501A,0x5DF2,0x4E59,0x77E3,0x4EE5,0x827A,0x6291,0xF9E0,/* 0xD0-0xD7 */ -- 0x9091,0x5C79,0x4EBF,0x5F79,0x81C6,0xFA25,0x8084,0x75AB,/* 0xD8-0xDF */ -- 0x4EA6,0x88D4,0x610F,0x6BC5,0x5FC6,0x4E49,0xFA17,0x6EA2,/* 0xE0-0xE7 */ -+ 0x501A,0x5DF2,0x4E59,0x77E3,0x4EE5,0x827A,0x6291,0x6613,/* 0xD0-0xD7 */ -+ 0x9091,0x5C79,0x4EBF,0x5F79,0x81C6,0x9038,0x8084,0x75AB,/* 0xD8-0xDF */ -+ 0x4EA6,0x88D4,0x610F,0x6BC5,0x5FC6,0x4E49,0x76CA,0x6EA2,/* 0xE0-0xE7 */ - 0x8BE3,0x8BAE,0x8C0A,0x8BD1,0x5F02,0x7FFC,0x7FCC,0x7ECE,/* 0xE8-0xEF */ - 0x8335,0x836B,0x56E0,0x6BB7,0x97F3,0x9634,0x59FB,0x541F,/* 0xF0-0xF7 */ - 0x94F6,0x6DEB,0x5BC5,0x996E,0x5C39,0x5F15,0x9690,0x0000,/* 0xF8-0xFF */ -@@ -2923,7 +2925,7 @@ - 0x8FC2,0x6DE4,0x4E8E,0x76C2,0x6986,0x865E,0x611A,0x8206,/* 0xD8-0xDF */ - 0x4F59,0x4FDE,0x903E,0x9C7C,0x6109,0x6E1D,0x6E14,0x9685,/* 0xE0-0xE7 */ - 0x4E88,0x5A31,0x96E8,0x4E0E,0x5C7F,0x79B9,0x5B87,0x8BED,/* 0xE8-0xEF */ -- 0xFA1E,0x7389,0x57DF,0x828B,0x90C1,0x5401,0x9047,0x55BB,/* 0xF0-0xF7 */ -+ 0x7FBD,0x7389,0x57DF,0x828B,0x90C1,0x5401,0x9047,0x55BB,/* 0xF0-0xF7 */ - 0x5CEA,0x5FA1,0x6108,0x6B32,0x72F1,0x80B2,0x8A89,0x0000,/* 0xF8-0xFF */ - }; - -@@ -2976,17 +2978,17 @@ - 0x8A8B,0x8A8C,0x8A8D,0x8A8E,0x8A8F,0x8A90,0x8A91,0x8A92,/* 0x48-0x4F */ - 0x8A94,0x8A95,0x8A96,0x8A97,0x8A98,0x8A99,0x8A9A,0x8A9B,/* 0x50-0x57 */ - 0x8A9C,0x8A9D,0x8A9E,0x8A9F,0x8AA0,0x8AA1,0x8AA2,0x8AA3,/* 0x58-0x5F */ -- 0x8AA4,0x8AA5,0x8AA6,0x8AA7,0x8AA8,0x8AA9,0xF9A1,0x8AAB,/* 0x60-0x67 */ -+ 0x8AA4,0x8AA5,0x8AA6,0x8AA7,0x8AA8,0x8AA9,0x8AAA,0x8AAB,/* 0x60-0x67 */ - 0x8AAC,0x8AAD,0x8AAE,0x8AAF,0x8AB0,0x8AB1,0x8AB2,0x8AB3,/* 0x68-0x6F */ - 0x8AB4,0x8AB5,0x8AB6,0x8AB7,0x8AB8,0x8AB9,0x8ABA,0x8ABB,/* 0x70-0x77 */ - 0x8ABC,0x8ABD,0x8ABE,0x8ABF,0x8AC0,0x8AC1,0x8AC2,0x0000,/* 0x78-0x7F */ - - 0x8AC3,0x8AC4,0x8AC5,0x8AC6,0x8AC7,0x8AC8,0x8AC9,0x8ACA,/* 0x80-0x87 */ -- 0x8ACB,0x8ACC,0x8ACD,0x8ACE,0x8ACF,0x8AD0,0x8AD1,0xF97D,/* 0x88-0x8F */ -- 0x8AD3,0x8AD4,0x8AD5,0xF941,0x8AD7,0x8AD8,0x8AD9,0x8ADA,/* 0x90-0x97 */ -+ 0x8ACB,0x8ACC,0x8ACD,0x8ACE,0x8ACF,0x8AD0,0x8AD1,0x8AD2,/* 0x88-0x8F */ -+ 0x8AD3,0x8AD4,0x8AD5,0x8AD6,0x8AD7,0x8AD8,0x8AD9,0x8ADA,/* 0x90-0x97 */ - 0x8ADB,0x8ADC,0x8ADD,0x8ADE,0x8ADF,0x8AE0,0x8AE1,0x8AE2,/* 0x98-0x9F */ - 0x8AE3,0x94E1,0x95F8,0x7728,0x6805,0x69A8,0x548B,0x4E4D,/* 0xA0-0xA7 */ -- 0x70B8,0x8BC8,0x6458,0x658B,0xFA04,0x7A84,0x503A,0x5BE8,/* 0xA8-0xAF */ -+ 0x70B8,0x8BC8,0x6458,0x658B,0x5B85,0x7A84,0x503A,0x5BE8,/* 0xA8-0xAF */ - 0x77BB,0x6BE1,0x8A79,0x7C98,0x6CBE,0x76CF,0x65A9,0x8F97,/* 0xB0-0xB7 */ - 0x5D2D,0x5C55,0x8638,0x6808,0x5360,0x6218,0x7AD9,0x6E5B,/* 0xB8-0xBF */ - 0x7EFD,0x6A1F,0x7AE0,0x5F70,0x6F33,0x5F20,0x638C,0x6DA8,/* 0xC0-0xC7 */ -@@ -3010,8 +3012,8 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x8AE4,0x8AE5,0x8AE6,0x8AE7,0x8AE8,0x8AE9,0x8AEA,0x8AEB,/* 0x40-0x47 */ - 0x8AEC,0x8AED,0x8AEE,0x8AEF,0x8AF0,0x8AF1,0x8AF2,0x8AF3,/* 0x48-0x4F */ -- 0x8AF4,0x8AF5,0x8AF6,0x8AF7,0xFA22,0x8AF9,0x8AFA,0x8AFB,/* 0x50-0x57 */ -- 0x8AFC,0x8AFD,0xF95D,0x8AFF,0x8B00,0x8B01,0x8B02,0x8B03,/* 0x58-0x5F */ -+ 0x8AF4,0x8AF5,0x8AF6,0x8AF7,0x8AF8,0x8AF9,0x8AFA,0x8AFB,/* 0x50-0x57 */ -+ 0x8AFC,0x8AFD,0x8AFE,0x8AFF,0x8B00,0x8B01,0x8B02,0x8B03,/* 0x58-0x5F */ - 0x8B04,0x8B05,0x8B06,0x8B08,0x8B09,0x8B0A,0x8B0B,0x8B0C,/* 0x60-0x67 */ - 0x8B0D,0x8B0E,0x8B0F,0x8B10,0x8B11,0x8B12,0x8B13,0x8B14,/* 0x68-0x6F */ - 0x8B15,0x8B16,0x8B17,0x8B18,0x8B19,0x8B1A,0x8B1B,0x8B1C,/* 0x70-0x77 */ -@@ -3026,7 +3028,7 @@ - 0x804C,0x76F4,0x690D,0x6B96,0x6267,0x503C,0x4F84,0x5740,/* 0xB0-0xB7 */ - 0x6307,0x6B62,0x8DBE,0x53EA,0x65E8,0x7EB8,0x5FD7,0x631A,/* 0xB8-0xBF */ - 0x63B7,0x81F3,0x81F4,0x7F6E,0x5E1C,0x5CD9,0x5236,0x667A,/* 0xC0-0xC7 */ -- 0x79E9,0x7A1A,0x8D28,0xF9FB,0x75D4,0x6EDE,0x6CBB,0x7A92,/* 0xC8-0xCF */ -+ 0x79E9,0x7A1A,0x8D28,0x7099,0x75D4,0x6EDE,0x6CBB,0x7A92,/* 0xC8-0xCF */ - 0x4E2D,0x76C5,0x5FE0,0x949F,0x8877,0x7EC8,0x79CD,0x80BF,/* 0xD0-0xD7 */ - 0x91CD,0x4EF2,0x4F17,0x821F,0x5468,0x5DDE,0x6D32,0x8BCC,/* 0xD8-0xDF */ - 0x7CA5,0x8F74,0x8098,0x5E1A,0x5492,0x76B1,0x5B99,0x663C,/* 0xE0-0xE7 */ -@@ -3046,12 +3048,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x8B46,0x8B47,0x8B48,0x8B49,0x8B4A,0x8B4B,0x8B4C,0x8B4D,/* 0x40-0x47 */ - 0x8B4E,0x8B4F,0x8B50,0x8B51,0x8B52,0x8B53,0x8B54,0x8B55,/* 0x48-0x4F */ -- 0x8B56,0x8B57,0xF9FC,0x8B59,0x8B5A,0x8B5B,0x8B5C,0x8B5D,/* 0x50-0x57 */ -+ 0x8B56,0x8B57,0x8B58,0x8B59,0x8B5A,0x8B5B,0x8B5C,0x8B5D,/* 0x50-0x57 */ - 0x8B5E,0x8B5F,0x8B60,0x8B61,0x8B62,0x8B63,0x8B64,0x8B65,/* 0x58-0x5F */ - 0x8B67,0x8B68,0x8B69,0x8B6A,0x8B6B,0x8B6D,0x8B6E,0x8B6F,/* 0x60-0x67 */ - 0x8B70,0x8B71,0x8B72,0x8B73,0x8B74,0x8B75,0x8B76,0x8B77,/* 0x68-0x6F */ - 0x8B78,0x8B79,0x8B7A,0x8B7B,0x8B7C,0x8B7D,0x8B7E,0x8B7F,/* 0x70-0x77 */ -- 0xF95A,0x8B81,0x8B82,0x8B83,0x8B84,0x8B85,0x8B86,0x0000,/* 0x78-0x7F */ -+ 0x8B80,0x8B81,0x8B82,0x8B83,0x8B84,0x8B85,0x8B86,0x0000,/* 0x78-0x7F */ - - 0x8B87,0x8B88,0x8B89,0x8B8A,0x8B8B,0x8B8C,0x8B8D,0x8B8E,/* 0x80-0x87 */ - 0x8B8F,0x8B90,0x8B91,0x8B92,0x8B93,0x8B94,0x8B95,0x8B96,/* 0x88-0x8F */ -@@ -3081,11 +3083,11 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x8C38,0x8C39,0x8C3A,0x8C3B,0x8C3C,0x8C3D,0x8C3E,0x8C3F,/* 0x40-0x47 */ -- 0x8C40,0x8C42,0x8C43,0x8C44,0x8C45,0xF900,0x8C4A,0x8C4B,/* 0x48-0x4F */ -+ 0x8C40,0x8C42,0x8C43,0x8C44,0x8C45,0x8C48,0x8C4A,0x8C4B,/* 0x48-0x4F */ - 0x8C4D,0x8C4E,0x8C4F,0x8C50,0x8C51,0x8C52,0x8C53,0x8C54,/* 0x50-0x57 */ - 0x8C56,0x8C57,0x8C58,0x8C59,0x8C5B,0x8C5C,0x8C5D,0x8C5E,/* 0x58-0x5F */ - 0x8C5F,0x8C60,0x8C63,0x8C64,0x8C65,0x8C66,0x8C67,0x8C68,/* 0x60-0x67 */ -- 0x8C69,0xFA16,0x8C6D,0x8C6E,0x8C6F,0x8C70,0x8C71,0x8C72,/* 0x68-0x6F */ -+ 0x8C69,0x8C6C,0x8C6D,0x8C6E,0x8C6F,0x8C70,0x8C71,0x8C72,/* 0x68-0x6F */ - 0x8C74,0x8C75,0x8C76,0x8C77,0x8C7B,0x8C7C,0x8C7D,0x8C7E,/* 0x70-0x77 */ - 0x8C7F,0x8C80,0x8C81,0x8C83,0x8C84,0x8C86,0x8C87,0x0000,/* 0x78-0x7F */ - -@@ -3118,8 +3120,8 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x8CAE,0x8CAF,0x8CB0,0x8CB1,0x8CB2,0x8CB3,0x8CB4,0x8CB5,/* 0x40-0x47 */ - 0x8CB6,0x8CB7,0x8CB8,0x8CB9,0x8CBA,0x8CBB,0x8CBC,0x8CBD,/* 0x48-0x4F */ -- 0x8CBE,0x8CBF,0x8CC0,0x8CC1,0xF948,0x8CC3,0x8CC4,0x8CC5,/* 0x50-0x57 */ -- 0x8CC6,0x8CC7,0xF903,0x8CC9,0x8CCA,0x8CCB,0x8CCC,0x8CCD,/* 0x58-0x5F */ -+ 0x8CBE,0x8CBF,0x8CC0,0x8CC1,0x8CC2,0x8CC3,0x8CC4,0x8CC5,/* 0x50-0x57 */ -+ 0x8CC6,0x8CC7,0x8CC8,0x8CC9,0x8CCA,0x8CCB,0x8CCC,0x8CCD,/* 0x58-0x5F */ - 0x8CCE,0x8CCF,0x8CD0,0x8CD1,0x8CD2,0x8CD3,0x8CD4,0x8CD5,/* 0x60-0x67 */ - 0x8CD6,0x8CD7,0x8CD8,0x8CD9,0x8CDA,0x8CDB,0x8CDC,0x8CDD,/* 0x68-0x6F */ - 0x8CDE,0x8CDF,0x8CE0,0x8CE1,0x8CE2,0x8CE3,0x8CE4,0x8CE5,/* 0x70-0x77 */ -@@ -3233,7 +3235,7 @@ - 0x8EB3,0x8EB4,0x8EB5,0x8EB6,0x8EB7,0x8EB8,0x8EB9,0x8EBB,/* 0x70-0x77 */ - 0x8EBC,0x8EBD,0x8EBE,0x8EBF,0x8EC0,0x8EC1,0x8EC2,0x0000,/* 0x78-0x7F */ - -- 0x8EC3,0x8EC4,0x8EC5,0x8EC6,0x8EC7,0x8EC8,0x8EC9,0xF902,/* 0x80-0x87 */ -+ 0x8EC3,0x8EC4,0x8EC5,0x8EC6,0x8EC7,0x8EC8,0x8EC9,0x8ECA,/* 0x80-0x87 */ - 0x8ECB,0x8ECC,0x8ECD,0x8ECF,0x8ED0,0x8ED1,0x8ED2,0x8ED3,/* 0x88-0x8F */ - 0x8ED4,0x8ED5,0x8ED6,0x8ED7,0x8ED8,0x8ED9,0x8EDA,0x8EDB,/* 0x90-0x97 */ - 0x8EDC,0x8EDD,0x8EDE,0x8EDF,0x8EE0,0x8EE1,0x8EE2,0x8EE3,/* 0x98-0x9F */ -@@ -3269,9 +3271,9 @@ - 0x8F15,0x8F16,0x8F17,0x8F18,0x8F19,0x8F1A,0x8F1B,0x8F1C,/* 0x70-0x77 */ - 0x8F1D,0x8F1E,0x8F1F,0x8F20,0x8F21,0x8F22,0x8F23,0x0000,/* 0x78-0x7F */ - -- 0x8F24,0x8F25,0xF998,0x8F27,0x8F28,0x8F29,0xF9D7,0x8F2B,/* 0x80-0x87 */ -+ 0x8F24,0x8F25,0x8F26,0x8F27,0x8F28,0x8F29,0x8F2A,0x8F2B,/* 0x80-0x87 */ - 0x8F2C,0x8F2D,0x8F2E,0x8F2F,0x8F30,0x8F31,0x8F32,0x8F33,/* 0x88-0x8F */ -- 0x8F34,0x8F35,0x8F36,0x8F37,0x8F38,0x8F39,0x8F3A,0xFA07,/* 0x90-0x97 */ -+ 0x8F34,0x8F35,0x8F36,0x8F37,0x8F38,0x8F39,0x8F3A,0x8F3B,/* 0x90-0x97 */ - 0x8F3C,0x8F3D,0x8F3E,0x8F3F,0x8F40,0x8F41,0x8F42,0x8F43,/* 0x98-0x9F */ - 0x8F44,0x8368,0x831B,0x8369,0x836C,0x836A,0x836D,0x836E,/* 0xA0-0xA7 */ - 0x83B0,0x8378,0x83B3,0x83B4,0x83A0,0x83AA,0x8393,0x839C,/* 0xA8-0xAF */ -@@ -3299,7 +3301,7 @@ - 0x8F45,0x8F46,0x8F47,0x8F48,0x8F49,0x8F4A,0x8F4B,0x8F4C,/* 0x40-0x47 */ - 0x8F4D,0x8F4E,0x8F4F,0x8F50,0x8F51,0x8F52,0x8F53,0x8F54,/* 0x48-0x4F */ - 0x8F55,0x8F56,0x8F57,0x8F58,0x8F59,0x8F5A,0x8F5B,0x8F5C,/* 0x50-0x57 */ -- 0x8F5D,0x8F5E,0x8F5F,0x8F60,0x8F61,0xF98D,0x8F63,0x8F64,/* 0x58-0x5F */ -+ 0x8F5D,0x8F5E,0x8F5F,0x8F60,0x8F61,0x8F62,0x8F63,0x8F64,/* 0x58-0x5F */ - 0x8F65,0x8F6A,0x8F80,0x8F8C,0x8F92,0x8F9D,0x8FA0,0x8FA1,/* 0x60-0x67 */ - 0x8FA2,0x8FA4,0x8FA5,0x8FA6,0x8FA7,0x8FAA,0x8FAC,0x8FAD,/* 0x68-0x6F */ - 0x8FAE,0x8FAF,0x8FB2,0x8FB3,0x8FB4,0x8FB5,0x8FB7,0x8FB8,/* 0x70-0x77 */ -@@ -3309,7 +3311,7 @@ - 0x8FD7,0x8FDA,0x8FE0,0x8FE1,0x8FE3,0x8FE7,0x8FEC,0x8FEF,/* 0x88-0x8F */ - 0x8FF1,0x8FF2,0x8FF4,0x8FF5,0x8FF6,0x8FFA,0x8FFB,0x8FFC,/* 0x90-0x97 */ - 0x8FFE,0x8FFF,0x9007,0x9008,0x900C,0x900E,0x9013,0x9015,/* 0x98-0x9F */ -- 0x9018,0x8556,0x853B,0x84FF,0xF9C2,0x8559,0x8548,0x8568,/* 0xA0-0xA7 */ -+ 0x9018,0x8556,0x853B,0x84FF,0x84FC,0x8559,0x8548,0x8568,/* 0xA0-0xA7 */ - 0x8564,0x855E,0x857A,0x77A2,0x8543,0x8572,0x857B,0x85A4,/* 0xA8-0xAF */ - 0x85A8,0x8587,0x858F,0x8579,0x85AE,0x859C,0x8585,0x85B9,/* 0xB0-0xB7 */ - 0x85B7,0x85B0,0x85D3,0x85C1,0x85DC,0x85FF,0x8627,0x8605,/* 0xB8-0xBF */ -@@ -3332,17 +3334,17 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x9019,0x901C,0xF99A,0x9024,0x9025,0x9027,0x9028,0x9029,/* 0x40-0x47 */ -+ 0x9019,0x901C,0x9023,0x9024,0x9025,0x9027,0x9028,0x9029,/* 0x40-0x47 */ - 0x902A,0x902B,0x902C,0x9030,0x9031,0x9032,0x9033,0x9034,/* 0x48-0x4F */ - 0x9037,0x9039,0x903A,0x903D,0x903F,0x9040,0x9043,0x9045,/* 0x50-0x57 */ - 0x9046,0x9048,0x9049,0x904A,0x904B,0x904C,0x904E,0x9054,/* 0x58-0x5F */ - 0x9055,0x9056,0x9059,0x905A,0x905C,0x905D,0x905E,0x905F,/* 0x60-0x67 */ - 0x9060,0x9061,0x9064,0x9066,0x9067,0x9069,0x906A,0x906B,/* 0x68-0x6F */ - 0x906C,0x906F,0x9070,0x9071,0x9072,0x9073,0x9076,0x9077,/* 0x70-0x77 */ -- 0x9078,0x9079,0x907A,0x907B,0xF9C3,0x907E,0x9081,0x0000,/* 0x78-0x7F */ -+ 0x9078,0x9079,0x907A,0x907B,0x907C,0x907E,0x9081,0x0000,/* 0x78-0x7F */ - - 0x9084,0x9085,0x9086,0x9087,0x9089,0x908A,0x908C,0x908D,/* 0x80-0x87 */ -- 0x908E,0xF913,0x9090,0x9092,0x9094,0x9096,0x9098,0x909A,/* 0x88-0x8F */ -+ 0x908E,0x908F,0x9090,0x9092,0x9094,0x9096,0x9098,0x909A,/* 0x88-0x8F */ - 0x909C,0x909E,0x909F,0x90A0,0x90A4,0x90A5,0x90A7,0x90A8,/* 0x90-0x97 */ - 0x90A9,0x90AB,0x90AD,0x90B2,0x90B7,0x90BC,0x90BD,0x90BF,/* 0x98-0x9F */ - 0x90C0,0x647A,0x64B7,0x64B8,0x6499,0x64BA,0x64C0,0x64D0,/* 0xA0-0xA7 */ -@@ -3391,7 +3393,7 @@ - 0x562D,0x5658,0x5639,0x5657,0x562C,0x564D,0x5662,0x5659,/* 0xD8-0xDF */ - 0x565C,0x564C,0x5654,0x5686,0x5664,0x5671,0x566B,0x567B,/* 0xE0-0xE7 */ - 0x567C,0x5685,0x5693,0x56AF,0x56D4,0x56D7,0x56DD,0x56E1,/* 0xE8-0xEF */ -- 0x56F5,0x56EB,0xF9A9,0x56FF,0x5704,0x570A,0x5709,0x571C,/* 0xF0-0xF7 */ -+ 0x56F5,0x56EB,0x56F9,0x56FF,0x5704,0x570A,0x5709,0x571C,/* 0xF0-0xF7 */ - 0x5E0F,0x5E19,0x5E14,0x5E11,0x5E31,0x5E3B,0x5E3C,0x0000,/* 0xF8-0xFF */ - }; - -@@ -3450,7 +3452,7 @@ - 0x921E,0x921F,0x9220,0x9221,0x9222,0x9223,0x9224,0x0000,/* 0x78-0x7F */ - - 0x9225,0x9226,0x9227,0x9228,0x9229,0x922A,0x922B,0x922C,/* 0x80-0x87 */ -- 0x922D,0x922E,0x922F,0x9230,0x9231,0x9232,0x9233,0xF9B1,/* 0x88-0x8F */ -+ 0x922D,0x922E,0x922F,0x9230,0x9231,0x9232,0x9233,0x9234,/* 0x88-0x8F */ - 0x9235,0x9236,0x9237,0x9238,0x9239,0x923A,0x923B,0x923C,/* 0x90-0x97 */ - 0x923D,0x923E,0x923F,0x9240,0x9241,0x9242,0x9243,0x9244,/* 0x98-0x9F */ - 0x9245,0x72FB,0x7317,0x7313,0x7321,0x730A,0x731E,0x731D,/* 0xA0-0xA7 */ -@@ -3524,7 +3526,7 @@ - 0x92E9,0x92EA,0x92EB,0x92EC,0x92ED,0x92EE,0x92EF,0x92F0,/* 0x80-0x87 */ - 0x92F1,0x92F2,0x92F3,0x92F4,0x92F5,0x92F6,0x92F7,0x92F8,/* 0x88-0x8F */ - 0x92F9,0x92FA,0x92FB,0x92FC,0x92FD,0x92FE,0x92FF,0x9300,/* 0x90-0x97 */ -- 0x9301,0x9302,0x9303,0xF93F,0x9305,0x9306,0x9307,0x9308,/* 0x98-0x9F */ -+ 0x9301,0x9302,0x9303,0x9304,0x9305,0x9306,0x9307,0x9308,/* 0x98-0x9F */ - 0x9309,0x6D39,0x6D27,0x6D0C,0x6D43,0x6D48,0x6D07,0x6D04,/* 0xA0-0xA7 */ - 0x6D19,0x6D0E,0x6D2B,0x6D4D,0x6D2E,0x6D35,0x6D1A,0x6D4F,/* 0xA8-0xAF */ - 0x6D52,0x6D54,0x6D33,0x6D91,0x6D6F,0x6D9E,0x6DA0,0x6D5E,/* 0xB0-0xB7 */ -@@ -3557,14 +3559,14 @@ - 0x933A,0x933B,0x933C,0x933D,0x933F,0x9340,0x9341,0x9342,/* 0x70-0x77 */ - 0x9343,0x9344,0x9345,0x9346,0x9347,0x9348,0x9349,0x0000,/* 0x78-0x7F */ - -- 0xF99B,0x934B,0x934C,0x934D,0x934E,0x934F,0x9350,0x9351,/* 0x80-0x87 */ -+ 0x934A,0x934B,0x934C,0x934D,0x934E,0x934F,0x9350,0x9351,/* 0x80-0x87 */ - 0x9352,0x9353,0x9354,0x9355,0x9356,0x9357,0x9358,0x9359,/* 0x88-0x8F */ - 0x935A,0x935B,0x935C,0x935D,0x935E,0x935F,0x9360,0x9361,/* 0x90-0x97 */ - 0x9362,0x9363,0x9364,0x9365,0x9366,0x9367,0x9368,0x9369,/* 0x98-0x9F */ - 0x936B,0x6FC9,0x6FA7,0x6FB9,0x6FB6,0x6FC2,0x6FE1,0x6FEE,/* 0xA0-0xA7 */ - 0x6FDE,0x6FE0,0x6FEF,0x701A,0x7023,0x701B,0x7039,0x7035,/* 0xA8-0xAF */ - 0x704F,0x705E,0x5B80,0x5B84,0x5B95,0x5B93,0x5BA5,0x5BB8,/* 0xB0-0xB7 */ -- 0x752F,0x9A9E,0x6434,0x5BE4,0xF9BC,0x8930,0x5BF0,0x8E47,/* 0xB8-0xBF */ -+ 0x752F,0x9A9E,0x6434,0x5BE4,0x5BEE,0x8930,0x5BF0,0x8E47,/* 0xB8-0xBF */ - 0x8B07,0x8FB6,0x8FD3,0x8FD5,0x8FE5,0x8FEE,0x8FE4,0x8FE9,/* 0xC0-0xC7 */ - 0x8FE6,0x8FF3,0x8FE8,0x9005,0x9004,0x900B,0x9026,0x9011,/* 0xC8-0xCF */ - 0x900D,0x9016,0x9021,0x9035,0x9036,0x902D,0x902F,0x9044,/* 0xD0-0xD7 */ -@@ -3643,7 +3645,7 @@ - 0x7F32,0x7F33,0x7F35,0x5E7A,0x757F,0x5DDB,0x753E,0x9095,/* 0xD8-0xDF */ - 0x738E,0x7391,0x73AE,0x73A2,0x739F,0x73CF,0x73C2,0x73D1,/* 0xE0-0xE7 */ - 0x73B7,0x73B3,0x73C0,0x73C9,0x73C8,0x73E5,0x73D9,0x987C,/* 0xE8-0xEF */ -- 0x740A,0x73E9,0x73E7,0xF917,0x73BA,0x73F2,0x740F,0x742A,/* 0xF0-0xF7 */ -+ 0x740A,0x73E9,0x73E7,0x73DE,0x73BA,0x73F2,0x740F,0x742A,/* 0xF0-0xF7 */ - 0x745B,0x7426,0x7425,0x7428,0x7430,0x742E,0x742C,0x0000,/* 0xF8-0xFF */ - }; - -@@ -3701,7 +3703,7 @@ - 0x959C,0x959D,0x959E,0x959F,0x95A0,0x95A1,0x95A2,0x95A3,/* 0x70-0x77 */ - 0x95A4,0x95A5,0x95A6,0x95A7,0x95A8,0x95A9,0x95AA,0x0000,/* 0x78-0x7F */ - -- 0x95AB,0x95AC,0xF986,0x95AE,0x95AF,0x95B0,0x95B1,0x95B2,/* 0x80-0x87 */ -+ 0x95AB,0x95AC,0x95AD,0x95AE,0x95AF,0x95B0,0x95B1,0x95B2,/* 0x80-0x87 */ - 0x95B3,0x95B4,0x95B5,0x95B6,0x95B7,0x95B8,0x95B9,0x95BA,/* 0x88-0x8F */ - 0x95BB,0x95BC,0x95BD,0x95BE,0x95BF,0x95C0,0x95C1,0x95C2,/* 0x90-0x97 */ - 0x95C3,0x95C4,0x95C5,0x95C6,0x95C7,0x95C8,0x95C9,0x95CA,/* 0x98-0x9F */ -@@ -3739,7 +3741,7 @@ - - 0x9658,0x9659,0x965A,0x965C,0x965D,0x965E,0x9660,0x9663,/* 0x80-0x87 */ - 0x9665,0x9666,0x966B,0x966D,0x966E,0x966F,0x9670,0x9671,/* 0x88-0x8F */ -- 0x9673,0xF9D3,0x9679,0x967A,0x967B,0x967C,0x967D,0x967E,/* 0x90-0x97 */ -+ 0x9673,0x9678,0x9679,0x967A,0x967B,0x967C,0x967D,0x967E,/* 0x90-0x97 */ - 0x967F,0x9680,0x9681,0x9682,0x9683,0x9684,0x9687,0x9689,/* 0x98-0x9F */ - 0x968A,0x8F8D,0x8F8E,0x8F8F,0x8F98,0x8F9A,0x8ECE,0x620B,/* 0xA0-0xA7 */ - 0x6217,0x621B,0x621F,0x6222,0x6221,0x6225,0x6224,0x622C,/* 0xA8-0xAF */ -@@ -3768,10 +3770,10 @@ - 0x969B,0x969D,0x969E,0x969F,0x96A0,0x96A1,0x96A2,0x96A3,/* 0x48-0x4F */ - 0x96A4,0x96A5,0x96A6,0x96A8,0x96A9,0x96AA,0x96AB,0x96AC,/* 0x50-0x57 */ - 0x96AD,0x96AE,0x96AF,0x96B1,0x96B2,0x96B4,0x96B5,0x96B7,/* 0x58-0x5F */ -- 0xF9B8,0x96BA,0x96BB,0x96BF,0x96C2,0x96C3,0x96C8,0x96CA,/* 0x60-0x67 */ -+ 0x96B8,0x96BA,0x96BB,0x96BF,0x96C2,0x96C3,0x96C8,0x96CA,/* 0x60-0x67 */ - 0x96CB,0x96D0,0x96D1,0x96D3,0x96D4,0x96D6,0x96D7,0x96D8,/* 0x68-0x6F */ - 0x96D9,0x96DA,0x96DB,0x96DC,0x96DD,0x96DE,0x96DF,0x96E1,/* 0x70-0x77 */ -- 0xF9EA,0x96E3,0x96E4,0x96E5,0x96E6,0x96E7,0x96EB,0x0000,/* 0x78-0x7F */ -+ 0x96E2,0x96E3,0x96E4,0x96E5,0x96E6,0x96E7,0x96EB,0x0000,/* 0x78-0x7F */ - - 0x96EC,0x96ED,0x96EE,0x96F0,0x96F1,0x96F2,0x96F4,0x96F5,/* 0x80-0x87 */ - 0x96F8,0x96FA,0x96FB,0x96FC,0x96FD,0x96FF,0x9702,0x9703,/* 0x88-0x8F */ -@@ -3804,7 +3806,7 @@ - 0x9729,0x972B,0x972C,0x972E,0x972F,0x9731,0x9733,0x9734,/* 0x48-0x4F */ - 0x9735,0x9736,0x9737,0x973A,0x973B,0x973C,0x973D,0x973F,/* 0x50-0x57 */ - 0x9740,0x9741,0x9742,0x9743,0x9744,0x9745,0x9746,0x9747,/* 0x58-0x5F */ -- 0xF9B3,0x9749,0x974A,0x974B,0x974C,0x974D,0x974E,0x974F,/* 0x60-0x67 */ -+ 0x9748,0x9749,0x974A,0x974B,0x974C,0x974D,0x974E,0x974F,/* 0x60-0x67 */ - 0x9750,0x9751,0x9754,0x9755,0x9757,0x9758,0x975A,0x975C,/* 0x68-0x6F */ - 0x975D,0x975F,0x9763,0x9764,0x9766,0x9767,0x9768,0x976A,/* 0x70-0x77 */ - 0x976B,0x976C,0x976D,0x976E,0x976F,0x9770,0x9771,0x0000,/* 0x78-0x7F */ -@@ -3873,7 +3875,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x980F,0x9810,0x9811,0x9812,0x9813,0x9814,0x9815,0x9816,/* 0x40-0x47 */ -- 0x9817,0xF9B4,0x9819,0x981A,0x981B,0x981C,0x981D,0x981E,/* 0x48-0x4F */ -+ 0x9817,0x9818,0x9819,0x981A,0x981B,0x981C,0x981D,0x981E,/* 0x48-0x4F */ - 0x981F,0x9820,0x9821,0x9822,0x9823,0x9824,0x9825,0x9826,/* 0x50-0x57 */ - 0x9827,0x9828,0x9829,0x982A,0x982B,0x982C,0x982D,0x982E,/* 0x58-0x5F */ - 0x982F,0x9830,0x9831,0x9832,0x9833,0x9834,0x9835,0x9836,/* 0x60-0x67 */ -@@ -3883,12 +3885,12 @@ - - 0x984E,0x984F,0x9850,0x9851,0x9852,0x9853,0x9854,0x9855,/* 0x80-0x87 */ - 0x9856,0x9857,0x9858,0x9859,0x985A,0x985B,0x985C,0x985D,/* 0x88-0x8F */ -- 0xF9D0,0x985F,0x9860,0x9861,0x9862,0x9863,0x9864,0x9865,/* 0x90-0x97 */ -+ 0x985E,0x985F,0x9860,0x9861,0x9862,0x9863,0x9864,0x9865,/* 0x90-0x97 */ - 0x9866,0x9867,0x9868,0x9869,0x986A,0x986B,0x986C,0x986D,/* 0x98-0x9F */ - 0x986E,0x7762,0x7765,0x777F,0x778D,0x777D,0x7780,0x778C,/* 0xA0-0xA7 */ - 0x7791,0x779F,0x77A0,0x77B0,0x77B5,0x77BD,0x753A,0x7540,/* 0xA8-0xAF */ - 0x754E,0x754B,0x7548,0x755B,0x7572,0x7579,0x7583,0x7F58,/* 0xB0-0xB7 */ -- 0x7F61,0x7F5F,0x8A48,0x7F68,0x7F74,0x7F71,0xF9E6,0x7F81,/* 0xB8-0xBF */ -+ 0x7F61,0x7F5F,0x8A48,0x7F68,0x7F74,0x7F71,0x7F79,0x7F81,/* 0xB8-0xBF */ - 0x7F7E,0x76CD,0x76E5,0x8832,0x9485,0x9486,0x9487,0x948B,/* 0xC0-0xC7 */ - 0x948A,0x948C,0x948D,0x948F,0x9490,0x9494,0x9497,0x9495,/* 0xC8-0xCF */ - 0x949A,0x949B,0x949C,0x94A3,0x94A4,0x94AB,0x94AA,0x94AD,/* 0xD0-0xD7 */ -@@ -3918,8 +3920,8 @@ - 0x98DC,0x98DD,0x98E0,0x98E1,0x98E2,0x98E3,0x98E4,0x0000,/* 0x78-0x7F */ - - 0x98E5,0x98E6,0x98E9,0x98EA,0x98EB,0x98EC,0x98ED,0x98EE,/* 0x80-0x87 */ -- 0xFA2A,0x98F0,0x98F1,0x98F2,0x98F3,0x98F4,0x98F5,0x98F6,/* 0x88-0x8F */ -- 0x98F7,0x98F8,0x98F9,0x98FA,0x98FB,0xFA2B,0x98FD,0x98FE,/* 0x90-0x97 */ -+ 0x98EF,0x98F0,0x98F1,0x98F2,0x98F3,0x98F4,0x98F5,0x98F6,/* 0x88-0x8F */ -+ 0x98F7,0x98F8,0x98F9,0x98FA,0x98FB,0x98FC,0x98FD,0x98FE,/* 0x90-0x97 */ - 0x98FF,0x9900,0x9901,0x9902,0x9903,0x9904,0x9905,0x9906,/* 0x98-0x9F */ - 0x9907,0x94E9,0x94EB,0x94EE,0x94EF,0x94F3,0x94F4,0x94F5,/* 0xA0-0xA7 */ - 0x94F7,0x94F9,0x94FC,0x94FD,0x94FF,0x9503,0x9502,0x9506,/* 0xA8-0xAF */ -@@ -3947,7 +3949,7 @@ - 0x9908,0x9909,0x990A,0x990B,0x990C,0x990E,0x990F,0x9911,/* 0x40-0x47 */ - 0x9912,0x9913,0x9914,0x9915,0x9916,0x9917,0x9918,0x9919,/* 0x48-0x4F */ - 0x991A,0x991B,0x991C,0x991D,0x991E,0x991F,0x9920,0x9921,/* 0x50-0x57 */ -- 0x9922,0x9923,0x9924,0x9925,0x9926,0x9927,0xFA2C,0x9929,/* 0x58-0x5F */ -+ 0x9922,0x9923,0x9924,0x9925,0x9926,0x9927,0x9928,0x9929,/* 0x58-0x5F */ - 0x992A,0x992B,0x992C,0x992D,0x992F,0x9930,0x9931,0x9932,/* 0x60-0x67 */ - 0x9933,0x9934,0x9935,0x9936,0x9937,0x9938,0x9939,0x993A,/* 0x68-0x6F */ - 0x993B,0x993C,0x993D,0x993E,0x993F,0x9940,0x9941,0x9942,/* 0x70-0x77 */ -@@ -3992,7 +3994,7 @@ - 0x99D9,0x99DA,0x99DB,0x99DC,0x99DD,0x99DE,0x99DF,0x99E0,/* 0x80-0x87 */ - 0x99E1,0x99E2,0x99E3,0x99E4,0x99E5,0x99E6,0x99E7,0x99E8,/* 0x88-0x8F */ - 0x99E9,0x99EA,0x99EB,0x99EC,0x99ED,0x99EE,0x99EF,0x99F0,/* 0x90-0x97 */ -- 0xF91A,0x99F2,0x99F3,0x99F4,0x99F5,0x99F6,0x99F7,0x99F8,/* 0x98-0x9F */ -+ 0x99F1,0x99F2,0x99F3,0x99F4,0x99F5,0x99F6,0x99F7,0x99F8,/* 0x98-0x9F */ - 0x99F9,0x761B,0x763C,0x7622,0x7620,0x7640,0x762D,0x7630,/* 0xA0-0xA7 */ - 0x763F,0x7635,0x7643,0x763E,0x7633,0x764D,0x765E,0x7654,/* 0xA8-0xAF */ - 0x765C,0x7656,0x766B,0x766F,0x7FCA,0x7AE6,0x7A78,0x7A79,/* 0xB0-0xB7 */ -@@ -4003,7 +4005,7 @@ - 0x8919,0x8913,0x891B,0x890A,0x8934,0x892B,0x8936,0x8941,/* 0xD8-0xDF */ - 0x8966,0x897B,0x758B,0x80E5,0x76B2,0x76B4,0x77DC,0x8012,/* 0xE0-0xE7 */ - 0x8014,0x8016,0x801C,0x8020,0x8022,0x8025,0x8026,0x8027,/* 0xE8-0xEF */ -- 0x8029,0x8028,0x8031,0x800B,0x8035,0x8043,0xF9B0,0x804D,/* 0xF0-0xF7 */ -+ 0x8029,0x8028,0x8031,0x800B,0x8035,0x8043,0x8046,0x804D,/* 0xF0-0xF7 */ - 0x8052,0x8069,0x8071,0x8983,0x9878,0x9880,0x9883,0x0000,/* 0xF8-0xFF */ - }; - -@@ -4054,7 +4056,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x9A5A,0x9A5B,0x9A5C,0x9A5D,0x9A5E,0x9A5F,0x9A60,0x9A61,/* 0x40-0x47 */ - 0x9A62,0x9A63,0x9A64,0x9A65,0x9A66,0x9A67,0x9A68,0x9A69,/* 0x48-0x4F */ -- 0xF987,0x9A6B,0x9A72,0x9A83,0x9A89,0x9A8D,0x9A8E,0x9A94,/* 0x50-0x57 */ -+ 0x9A6A,0x9A6B,0x9A72,0x9A83,0x9A89,0x9A8D,0x9A8E,0x9A94,/* 0x50-0x57 */ - 0x9A95,0x9A99,0x9AA6,0x9AA9,0x9AAA,0x9AAB,0x9AAC,0x9AAD,/* 0x58-0x5F */ - 0x9AAE,0x9AAF,0x9AB2,0x9AB3,0x9AB4,0x9AB5,0x9AB9,0x9ABB,/* 0x60-0x67 */ - 0x9ABD,0x9ABE,0x9ABF,0x9AC3,0x9AC4,0x9AC6,0x9AC7,0x9AC8,/* 0x68-0x6F */ -@@ -4071,7 +4073,7 @@ - 0x87FE,0x880A,0x881B,0x8821,0x8839,0x883C,0x7F36,0x7F42,/* 0xB8-0xBF */ - 0x7F44,0x7F45,0x8210,0x7AFA,0x7AFD,0x7B08,0x7B03,0x7B04,/* 0xC0-0xC7 */ - 0x7B15,0x7B0A,0x7B2B,0x7B0F,0x7B47,0x7B38,0x7B2A,0x7B19,/* 0xC8-0xCF */ -- 0x7B2E,0x7B31,0xF9F8,0x7B25,0x7B24,0x7B33,0x7B3E,0x7B1E,/* 0xD0-0xD7 */ -+ 0x7B2E,0x7B31,0x7B20,0x7B25,0x7B24,0x7B33,0x7B3E,0x7B1E,/* 0xD0-0xD7 */ - 0x7B58,0x7B5A,0x7B45,0x7B75,0x7B4C,0x7B5D,0x7B60,0x7B6E,/* 0xD8-0xDF */ - 0x7B7B,0x7B62,0x7B72,0x7B71,0x7B90,0x7BA6,0x7BA7,0x7BB8,/* 0xE0-0xE7 */ - 0x7BAC,0x7B9D,0x7BA8,0x7B85,0x7BAA,0x7B9C,0x7BA2,0x7BAB,/* 0xE8-0xEF */ -@@ -4099,7 +4101,7 @@ - - 0x9B5B,0x9B5C,0x9B5D,0x9B5E,0x9B5F,0x9B60,0x9B61,0x9B62,/* 0x80-0x87 */ - 0x9B63,0x9B64,0x9B65,0x9B66,0x9B67,0x9B68,0x9B69,0x9B6A,/* 0x88-0x8F */ -- 0x9B6B,0x9B6C,0x9B6D,0x9B6E,0xF939,0x9B70,0x9B71,0x9B72,/* 0x90-0x97 */ -+ 0x9B6B,0x9B6C,0x9B6D,0x9B6E,0x9B6F,0x9B70,0x9B71,0x9B72,/* 0x90-0x97 */ - 0x9B73,0x9B74,0x9B75,0x9B76,0x9B77,0x9B78,0x9B79,0x9B7A,/* 0x98-0x9F */ - 0x9B7B,0x7C1F,0x7C2A,0x7C26,0x7C38,0x7C41,0x7C40,0x81FE,/* 0xA0-0xA7 */ - 0x8201,0x8202,0x8204,0x81EC,0x8844,0x8221,0x8222,0x8223,/* 0xA8-0xAF */ -@@ -4139,7 +4141,7 @@ - 0x9BD3,0x9BD4,0x9BD5,0x9BD6,0x9BD7,0x9BD8,0x9BD9,0x9BDA,/* 0x98-0x9F */ - 0x9BDB,0x9162,0x9161,0x9170,0x9169,0x916F,0x917D,0x917E,/* 0xA0-0xA7 */ - 0x9172,0x9174,0x9179,0x918C,0x9185,0x9190,0x918D,0x9191,/* 0xA8-0xAF */ -- 0x91A2,0x91A3,0x91AA,0x91AD,0x91AE,0x91AF,0x91B5,0xF9B7,/* 0xB0-0xB7 */ -+ 0x91A2,0x91A3,0x91AA,0x91AD,0x91AE,0x91AF,0x91B5,0x91B4,/* 0xB0-0xB7 */ - 0x91BA,0x8C55,0x9E7E,0x8DB8,0x8DEB,0x8E05,0x8E59,0x8E69,/* 0xB8-0xBF */ - 0x8DB5,0x8DBF,0x8DBC,0x8DBA,0x8DC4,0x8DD6,0x8DD7,0x8DDA,/* 0xC0-0xC7 */ - 0x8DDE,0x8DCE,0x8DCF,0x8DDB,0x8DC6,0x8DEC,0x8DF7,0x8DF8,/* 0xC8-0xCF */ -@@ -4199,7 +4201,7 @@ - 0x9C3C,0x9C3D,0x9C3E,0x9C3F,0x9C40,0x9C41,0x9C42,0x9C43,/* 0x40-0x47 */ - 0x9C44,0x9C45,0x9C46,0x9C47,0x9C48,0x9C49,0x9C4A,0x9C4B,/* 0x48-0x4F */ - 0x9C4C,0x9C4D,0x9C4E,0x9C4F,0x9C50,0x9C51,0x9C52,0x9C53,/* 0x50-0x57 */ -- 0x9C54,0x9C55,0x9C56,0xF9F2,0x9C58,0x9C59,0x9C5A,0x9C5B,/* 0x58-0x5F */ -+ 0x9C54,0x9C55,0x9C56,0x9C57,0x9C58,0x9C59,0x9C5A,0x9C5B,/* 0x58-0x5F */ - 0x9C5C,0x9C5D,0x9C5E,0x9C5F,0x9C60,0x9C61,0x9C62,0x9C63,/* 0x60-0x67 */ - 0x9C64,0x9C65,0x9C66,0x9C67,0x9C68,0x9C69,0x9C6A,0x9C6B,/* 0x68-0x6F */ - 0x9C6C,0x9C6D,0x9C6E,0x9C6F,0x9C70,0x9C71,0x9C72,0x9C73,/* 0x70-0x77 */ -@@ -4218,7 +4220,7 @@ - 0x990D,0x992E,0x9955,0x9954,0x9ADF,0x9AE1,0x9AE6,0x9AEF,/* 0xD0-0xD7 */ - 0x9AEB,0x9AFB,0x9AED,0x9AF9,0x9B08,0x9B0F,0x9B13,0x9B1F,/* 0xD8-0xDF */ - 0x9B23,0x9EBD,0x9EBE,0x7E3B,0x9E82,0x9E87,0x9E88,0x9E8B,/* 0xE0-0xE7 */ -- 0x9E92,0x93D6,0x9E9D,0xF9F3,0x9EDB,0x9EDC,0x9EDD,0x9EE0,/* 0xE8-0xEF */ -+ 0x9E92,0x93D6,0x9E9D,0x9E9F,0x9EDB,0x9EDC,0x9EDD,0x9EE0,/* 0xE8-0xEF */ - 0x9EDF,0x9EE2,0x9EE9,0x9EE7,0x9EE5,0x9EEA,0x9EEF,0x9F22,/* 0xF0-0xF7 */ - 0x9F2C,0x9F2F,0x9F39,0x9F37,0x9F3D,0x9F3E,0x9F44,0x0000,/* 0xF8-0xFF */ - }; -@@ -4246,17 +4248,6 @@ - 0x9D32,0x9D33,0x9D34,0x9D35,0x9D36,0x9D37,0x9D38,0x9D39,/* 0x90-0x97 */ - 0x9D3A,0x9D3B,0x9D3C,0x9D3D,0x9D3E,0x9D3F,0x9D40,0x9D41,/* 0x98-0x9F */ - 0x9D42,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA8-0xAF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xB0-0xB7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xB8-0xBF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xC0-0xC7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xC8-0xCF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xD0-0xD7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xD8-0xDF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xE0-0xE7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xE8-0xEF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xF0-0xF7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_F9[256] = { -@@ -4295,7 +4286,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x9DA3,0x9DA4,0x9DA5,0x9DA6,0x9DA7,0x9DA8,0x9DA9,0x9DAA,/* 0x40-0x47 */ - 0x9DAB,0x9DAC,0x9DAD,0x9DAE,0x9DAF,0x9DB0,0x9DB1,0x9DB2,/* 0x48-0x4F */ -- 0x9DB3,0xFA2D,0x9DB5,0x9DB6,0x9DB7,0x9DB8,0x9DB9,0x9DBA,/* 0x50-0x57 */ -+ 0x9DB3,0x9DB4,0x9DB5,0x9DB6,0x9DB7,0x9DB8,0x9DB9,0x9DBA,/* 0x50-0x57 */ - 0x9DBB,0x9DBC,0x9DBD,0x9DBE,0x9DBF,0x9DC0,0x9DC1,0x9DC2,/* 0x58-0x5F */ - 0x9DC3,0x9DC4,0x9DC5,0x9DC6,0x9DC7,0x9DC8,0x9DC9,0x9DCA,/* 0x60-0x67 */ - 0x9DCB,0x9DCC,0x9DCD,0x9DCE,0x9DCF,0x9DD0,0x9DD1,0x9DD2,/* 0x68-0x6F */ -@@ -4305,7 +4296,7 @@ - 0x9DE2,0x9DE3,0x9DE4,0x9DE5,0x9DE6,0x9DE7,0x9DE8,0x9DE9,/* 0x80-0x87 */ - 0x9DEA,0x9DEB,0x9DEC,0x9DED,0x9DEE,0x9DEF,0x9DF0,0x9DF1,/* 0x88-0x8F */ - 0x9DF2,0x9DF3,0x9DF4,0x9DF5,0x9DF6,0x9DF7,0x9DF8,0x9DF9,/* 0x90-0x97 */ -- 0xF93A,0x9DFB,0x9DFC,0x9DFD,0x9DFE,0x9DFF,0x9E00,0x9E01,/* 0x98-0x9F */ -+ 0x9DFA,0x9DFB,0x9DFC,0x9DFD,0x9DFE,0x9DFF,0x9E00,0x9E01,/* 0x98-0x9F */ - 0x9E02,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ - }; - -@@ -4321,7 +4312,7 @@ - 0x9E03,0x9E04,0x9E05,0x9E06,0x9E07,0x9E08,0x9E09,0x9E0A,/* 0x40-0x47 */ - 0x9E0B,0x9E0C,0x9E0D,0x9E0E,0x9E0F,0x9E10,0x9E11,0x9E12,/* 0x48-0x4F */ - 0x9E13,0x9E14,0x9E15,0x9E16,0x9E17,0x9E18,0x9E19,0x9E1A,/* 0x50-0x57 */ -- 0x9E1B,0x9E1C,0x9E1D,0xF920,0x9E24,0x9E27,0x9E2E,0x9E30,/* 0x58-0x5F */ -+ 0x9E1B,0x9E1C,0x9E1D,0x9E1E,0x9E24,0x9E27,0x9E2E,0x9E30,/* 0x58-0x5F */ - 0x9E34,0x9E3B,0x9E3C,0x9E40,0x9E4D,0x9E50,0x9E52,0x9E53,/* 0x60-0x67 */ - 0x9E54,0x9E56,0x9E59,0x9E5D,0x9E5F,0x9E60,0x9E61,0x9E62,/* 0x68-0x6F */ - 0x9E65,0x9E6E,0x9E6F,0x9E72,0x9E74,0x9E75,0x9E76,0x9E77,/* 0x70-0x77 */ -@@ -4329,7 +4320,7 @@ - - 0x9E81,0x9E83,0x9E84,0x9E85,0x9E86,0x9E89,0x9E8A,0x9E8C,/* 0x80-0x87 */ - 0x9E8D,0x9E8E,0x9E8F,0x9E90,0x9E91,0x9E94,0x9E95,0x9E96,/* 0x88-0x8F */ -- 0xF988,0x9E98,0x9E99,0x9E9A,0x9E9B,0x9E9C,0x9E9E,0x9EA0,/* 0x90-0x97 */ -+ 0x9E97,0x9E98,0x9E99,0x9E9A,0x9E9B,0x9E9C,0x9E9E,0x9EA0,/* 0x90-0x97 */ - 0x9EA1,0x9EA2,0x9EA3,0x9EA4,0x9EA5,0x9EA7,0x9EA8,0x9EA9,/* 0x98-0x9F */ - 0x9EAA,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ - }; -@@ -4378,8 +4369,8 @@ - 0x9F72,0x9F73,0x9F74,0x9F75,0x9F76,0x9F77,0x9F78,0x0000,/* 0x78-0x7F */ - - 0x9F79,0x9F7A,0x9F7B,0x9F7C,0x9F7D,0x9F7E,0x9F81,0x9F82,/* 0x80-0x87 */ -- 0xF9C4,0x9F8E,0x9F8F,0x9F90,0x9F91,0x9F92,0x9F93,0x9F94,/* 0x88-0x8F */ -- 0x9F95,0x9F96,0x9F97,0x9F98,0xF908,0x9F9D,0x9F9E,0x9FA1,/* 0x90-0x97 */ -+ 0x9F8D,0x9F8E,0x9F8F,0x9F90,0x9F91,0x9F92,0x9F93,0x9F94,/* 0x88-0x8F */ -+ 0x9F95,0x9F96,0x9F97,0x9F98,0x9F9C,0x9F9D,0x9F9E,0x9FA1,/* 0x90-0x97 */ - 0x9FA2,0x9FA3,0x9FA4,0x9FA5,0xF92C,0xF979,0xF995,0xF9E7,/* 0x98-0x9F */ - 0xF9F1,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ - }; -@@ -4432,18 +4423,88 @@ - c2u_F8, c2u_F9, c2u_FA, c2u_FB, c2u_FC, c2u_FD, c2u_FE, NULL, - }; - -+ -+static unsigned char u2c_00[512] = { -+ 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, /* 0x00-0x03 */ -+ 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, /* 0x04-0x07 */ -+ 0x00, 0x08, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, /* 0x08-0x0B */ -+ 0x00, 0x0C, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x0F, /* 0x0C-0x0F */ -+ 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, /* 0x10-0x13 */ -+ 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, /* 0x14-0x17 */ -+ 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, /* 0x18-0x1B */ -+ 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, /* 0x1C-0x1F */ -+ 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, /* 0x20-0x23 */ -+ 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, /* 0x24-0x27 */ -+ 0x00, 0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, /* 0x28-0x2B */ -+ 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2E, 0x00, 0x2F, /* 0x2C-0x2F */ -+ 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, /* 0x30-0x33 */ -+ 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, /* 0x34-0x37 */ -+ 0x00, 0x38, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3B, /* 0x38-0x3B */ -+ 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x3F, /* 0x3C-0x3F */ -+ 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, /* 0x40-0x43 */ -+ 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, /* 0x44-0x47 */ -+ 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, /* 0x48-0x4B */ -+ 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, /* 0x4C-0x4F */ -+ 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, /* 0x50-0x53 */ -+ 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, /* 0x54-0x57 */ -+ 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, /* 0x58-0x5B */ -+ 0x00, 0x5C, 0x00, 0x5D, 0x00, 0x5E, 0x00, 0x5F, /* 0x5C-0x5F */ -+ 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, /* 0x60-0x63 */ -+ 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, /* 0x64-0x67 */ -+ 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00, 0x6B, /* 0x68-0x6B */ -+ 0x00, 0x6C, 0x00, 0x6D, 0x00, 0x6E, 0x00, 0x6F, /* 0x6C-0x6F */ -+ 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, /* 0x70-0x73 */ -+ 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, /* 0x74-0x77 */ -+ 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, /* 0x78-0x7B */ -+ 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, /* 0x7C-0x7F */ -+ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ -+ 0xA1, 0xE8, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xEC, /* 0xA4-0xA7 */ -+ 0xA1, 0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xAC-0xAF */ -+ 0xA1, 0xE3, 0xA1, 0xC0, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xA4, /* 0xB4-0xB7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC1, /* 0xD4-0xD7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ -+ 0xA8, 0xA4, 0xA8, 0xA2, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE4-0xE7 */ -+ 0xA8, 0xA8, 0xA8, 0xA6, 0xA8, 0xBA, 0x00, 0x00, /* 0xE8-0xEB */ -+ 0xA8, 0xAC, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ -+ 0x00, 0x00, 0x00, 0x00, 0xA8, 0xB0, 0xA8, 0xAE, /* 0xF0-0xF3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC2, /* 0xF4-0xF7 */ -+ 0x00, 0x00, 0xA8, 0xB4, 0xA8, 0xB2, 0x00, 0x00, /* 0xF8-0xFB */ -+ 0xA8, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ -+}; -+ -+ - static unsigned char u2c_01[512] = { -- 0xA8, 0xA1, 0xA8, 0xA1, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ -+ 0x00, 0x00, 0xA8, 0xA1, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ -- 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA5, 0xA8, 0xA5, /* 0x10-0x13 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA5, /* 0x10-0x13 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -- 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA7, 0xA8, 0xA7, /* 0x18-0x1B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA7, /* 0x18-0x1B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ -- 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA9, 0xA8, 0xA9, /* 0x28-0x2B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA9, /* 0x28-0x2B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -@@ -4452,14 +4513,14 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ - 0xA8, 0xBD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ - 0xA8, 0xBE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ -- 0xA8, 0xAD, 0xA8, 0xAD, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -+ 0x00, 0x00, 0xA8, 0xAD, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ -- 0x00, 0x00, 0x00, 0x00, 0xA8, 0xB1, 0xA8, 0xB1, /* 0x68-0x6B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xB1, /* 0x68-0x6B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ -@@ -4482,13 +4543,13 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB4-0xB7 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ -- 0x00, 0x00, 0xA1, 0xCE, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -- 0x00, 0x00, 0xA8, 0xA3, 0xA8, 0xA3, 0xA8, 0xAB, /* 0xCC-0xCF */ -- 0xA8, 0xAB, 0xA8, 0xAF, 0xA8, 0xAF, 0xA8, 0xB3, /* 0xD0-0xD3 */ -- 0xA8, 0xB3, 0xA8, 0xB5, 0xA8, 0xB5, 0xA8, 0xB6, /* 0xD4-0xD7 */ -- 0xA8, 0xB6, 0xA8, 0xB7, 0xA8, 0xB7, 0xA8, 0xB8, /* 0xD8-0xDB */ -+ 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA3, 0x00, 0x00, /* 0xCC-0xCF */ -+ 0xA8, 0xAB, 0x00, 0x00, 0xA8, 0xAF, 0x00, 0x00, /* 0xD0-0xD3 */ -+ 0xA8, 0xB3, 0x00, 0x00, 0xA8, 0xB5, 0x00, 0x00, /* 0xD4-0xD7 */ -+ 0xA8, 0xB6, 0x00, 0x00, 0xA8, 0xB7, 0x00, 0x00, /* 0xD8-0xDB */ - 0xA8, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ - }; - -@@ -4699,7 +4760,7 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC7, /* 0x0C-0x0F */ - 0x00, 0x00, 0xA1, 0xC6, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ - 0x00, 0x00, 0xA8, 0x4D, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -- 0xA1, 0xE3, 0x00, 0x00, 0xA1, 0xCC, 0x00, 0x00, /* 0x18-0x1B */ -+ 0x00, 0x00, 0x00, 0x00, 0xA1, 0xCC, 0x00, 0x00, /* 0x18-0x1B */ - 0x00, 0x00, 0xA1, 0xD8, 0xA1, 0xDE, 0xA8, 0x4E, /* 0x1C-0x1F */ - 0xA1, 0xCF, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x4F, /* 0x20-0x23 */ - 0x00, 0x00, 0xA1, 0xCE, 0x00, 0x00, 0xA1, 0xC4, /* 0x24-0x27 */ -@@ -4708,7 +4769,7 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ - 0xA1, 0xE0, 0xA1, 0xDF, 0xA1, 0xC3, 0xA1, 0xCB, /* 0x34-0x37 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -- 0xA1, 0xAB, 0xA1, 0xD7, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -+ 0x00, 0x00, 0xA1, 0xD7, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ - 0xA1, 0xD6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ -@@ -4855,12 +4916,6 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ - 0x00, 0x00, 0x00, 0x00, 0xA8, 0x8D, 0xA8, 0x8E, /* 0xE0-0xE3 */ - 0xA8, 0x8F, 0xA8, 0x90, 0x00, 0x00, 0x00, 0x00, /* 0xE4-0xE7 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE8-0xEB */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF4-0xF7 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF8-0xFB */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ - }; - - static unsigned char u2c_26[512] = { -@@ -4963,36 +5018,6 @@ - 0xA8, 0xE0, 0xA8, 0xE1, 0xA8, 0xE2, 0xA8, 0xE3, /* 0x20-0x23 */ - 0xA8, 0xE4, 0xA8, 0xE5, 0xA8, 0xE6, 0xA8, 0xE7, /* 0x24-0x27 */ - 0xA8, 0xE8, 0xA8, 0xE9, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ -- -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -- 0x00, 0x00, 0x00, 0x00, 0xD2, 0xBB, 0xB6, 0xFE, /* 0x90-0x93 */ -- 0xC8, 0xFD, 0xCB, 0xC4, 0xC9, 0xCF, 0xD6, 0xD0, /* 0x94-0x97 */ -- 0xCF, 0xC2, 0xBC, 0xD7, 0xD2, 0xD2, 0xB1, 0xFB, /* 0x98-0x9B */ -- 0xB6, 0xA1, 0xCC, 0xEC, 0xB5, 0xD8, 0xC8, 0xCB, /* 0x9C-0x9F */ - }; - - static unsigned char u2c_32[512] = { -@@ -5006,13 +5031,13 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ - 0xA2, 0xE5, 0xA2, 0xE6, 0xA2, 0xE7, 0xA2, 0xE8, /* 0x20-0x23 */ - 0xA2, 0xE9, 0xA2, 0xEA, 0xA2, 0xEB, 0xA2, 0xEC, /* 0x24-0x27 */ -- 0xA2, 0xED, 0xA2, 0xEE, 0xD4, 0xC2, 0xBB, 0xF0, /* 0x28-0x2B */ -- 0xCB, 0xAE, 0xC4, 0xBE, 0xBD, 0xF0, 0xCD, 0xC1, /* 0x2C-0x2F */ -- 0xC8, 0xD5, 0xA9, 0x5A, 0xD3, 0xD0, 0xC9, 0xE7, /* 0x30-0x33 */ -- 0xC3, 0xFB, 0xCC, 0xD8, 0xB2, 0xC6, 0xD7, 0xA3, /* 0x34-0x37 */ -- 0xC0, 0xCD, 0xB4, 0xFA, 0xBA, 0xF4, 0xD1, 0xA7, /* 0x38-0x3B */ -- 0xBC, 0xE0, 0xC6, 0xF3, 0xD7, 0xCA, 0xD0, 0xAD, /* 0x3C-0x3F */ -- 0xBC, 0xC0, 0xD0, 0xDD, 0xD7, 0xD4, 0xD6, 0xC1, /* 0x40-0x43 */ -+ 0xA2, 0xED, 0xA2, 0xEE, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -+ 0x00, 0x00, 0xA9, 0x5A, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -@@ -5029,19 +5054,15 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - -- 0xD2, 0xBB, 0xB6, 0xFE, 0xC8, 0xFD, 0xCB, 0xC4, /* 0x80-0x83 */ -- 0xCE, 0xE5, 0xC1, 0xF9, 0xC6, 0xDF, 0xB0, 0xCB, /* 0x84-0x87 */ -- 0xBE, 0xC5, 0xCA, 0xAE, 0xD4, 0xC2, 0xBB, 0xF0, /* 0x88-0x8B */ -- 0xCB, 0xAE, 0xC4, 0xBE, 0xBD, 0xF0, 0xCD, 0xC1, /* 0x8C-0x8F */ -- 0xC8, 0xD5, 0xD6, 0xEA, 0xD3, 0xD0, 0xC9, 0xE7, /* 0x90-0x93 */ -- 0xC3, 0xFB, 0xCC, 0xD8, 0xB2, 0xC6, 0xD7, 0xA3, /* 0x94-0x97 */ -- 0xC0, 0xCD, 0xC3, 0xD8, 0xC4, 0xD0, 0xC5, 0xAE, /* 0x98-0x9B */ -- 0xCA, 0xCA, 0xD3, 0xC5, 0x00, 0x00, 0xD7, 0xA2, /* 0x9C-0x9F */ -- 0xCF, 0xEE, 0xD0, 0xDD, 0xD0, 0xB4, 0xA9, 0x49, /* 0xA0-0xA3 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ -- 0x00, 0x00, 0xD2, 0xBD, 0xD7, 0xDA, 0xD1, 0xA7, /* 0xA8-0xAB */ -- 0xBC, 0xE0, 0xC6, 0xF3, 0xD7, 0xCA, 0xD0, 0xAD, /* 0xAC-0xAF */ -- 0xD2, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA9, 0x49, /* 0xA0-0xA3 */ - }; - - static unsigned char u2c_33[512] = { -@@ -10656,91 +10677,82 @@ - 0xFD, 0x9A, 0xFD, 0x9B, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ - }; - --static unsigned char u2c_DC[512] = { -+static unsigned char u2c_F9[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ --}; -- --static unsigned char u2c_F9[512] = { -- 0xD8, 0x4D, 0xB8, 0xFC, 0xDC, 0x87, 0xD9, 0x5A, /* 0x00-0x03 */ -- 0xBB, 0xAC, 0xB4, 0xAE, 0xBE, 0xE4, 0xFD, 0x94, /* 0x04-0x07 */ -- 0xFD, 0x94, 0xC6, 0xF5, 0xBD, 0xF0, 0xC0, 0xAE, /* 0x08-0x0B */ -- 0xC4, 0xCE, 0x91, 0xD0, 0xB0, 0x5D, 0xC1, 0x5F, /* 0x0C-0x0F */ -- 0xCC, 0x7D, 0xC2, 0xDD, 0xC2, 0xE3, 0xDF, 0x89, /* 0x10-0x13 */ -- 0x98, 0xB7, 0xC2, 0xE5, 0xC0, 0xD3, 0xE7, 0xF3, /* 0x14-0x17 */ -- 0xC2, 0xE4, 0xC0, 0xD2, 0xF1, 0x98, 0x81, 0x79, /* 0x18-0x1B */ -- 0xC2, 0xD1, 0x99, 0xDA, 0xA0, 0x80, 0xCC, 0x6D, /* 0x1C-0x1F */ -- 0xFB, 0x5B, 0x8D, 0xB9, 0x9E, 0x45, 0xCB, 0x7B, /* 0x20-0x23 */ -- 0xD2, 0x68, 0xC0, 0xAD, 0xC5, 0x44, 0xCF, 0x9E, /* 0x24-0x27 */ -- 0xC0, 0xC8, 0xC0, 0xCA, 0xC0, 0xCB, 0xC0, 0xC7, /* 0x28-0x2B */ -- 0xFD, 0x9C, 0x81, 0xED, 0xC0, 0xE4, 0x84, 0xDA, /* 0x2C-0x2F */ -- 0x93, 0xEF, 0x99, 0xA9, 0xA0, 0x74, 0xB1, 0x52, /* 0x30-0x33 */ -- 0xC0, 0xCF, 0xCC, 0x4A, 0xCC, 0x94, 0xC2, 0xB7, /* 0x34-0x37 */ -- 0xC2, 0xB6, 0xF4, 0x94, 0xFA, 0x98, 0xC2, 0xB5, /* 0x38-0x3B */ -- 0xB5, 0x93, 0xBE, 0x47, 0xC7, 0x8A, 0xE4, 0x9B, /* 0x3C-0x3F */ -- 0xC2, 0xB9, 0xD5, 0x93, 0x89, 0xC5, 0xC5, 0xAA, /* 0x40-0x43 */ -- 0xBB, 0x5C, 0xC3, 0x40, 0xC0, 0xCE, 0xC0, 0xDA, /* 0x44-0x47 */ -- 0xD9, 0x54, 0xC0, 0xD7, 0x89, 0xBE, 0x8C, 0xD2, /* 0x48-0x4B */ -- 0x98, 0xC7, 0x9C, 0x49, 0xC2, 0xA9, 0xC0, 0xDB, /* 0x4C-0x4F */ -- 0xBF, 0x7C, 0xC2, 0xAA, 0xC0, 0xD5, 0xC0, 0xDF, /* 0x50-0x53 */ -- 0x84, 0x43, 0xC1, 0xE8, 0xB6, 0xA0, 0xBE, 0x63, /* 0x54-0x57 */ -- 0xC1, 0xE2, 0xC1, 0xEA, 0xD7, 0x78, 0x92, 0x82, /* 0x58-0x5B */ -- 0x98, 0xB7, 0xD6, 0x5A, 0xB5, 0xA4, 0x8C, 0x8E, /* 0x5C-0x5F */ -- 0xC5, 0xAD, 0xC2, 0xCA, 0xAE, 0x90, 0xB1, 0xB1, /* 0x60-0x63 */ -- 0xB4, 0x91, 0xB1, 0xE3, 0x8F, 0xCD, 0xB2, 0xBB, /* 0x64-0x67 */ -- 0xC3, 0xDA, 0x94, 0xB5, 0xCB, 0xF7, 0x85, 0xA2, /* 0x68-0x6B */ -- 0xC8, 0xFB, 0xCA, 0xA1, 0xC8, 0x7E, 0xD5, 0x66, /* 0x6C-0x6F */ -- 0x9A, 0xA2, 0xB3, 0xBD, 0xC9, 0xF2, 0xCA, 0xB0, /* 0x70-0x73 */ -- 0xC8, 0xF4, 0xC2, 0xD3, 0xC2, 0xD4, 0xC1, 0xC1, /* 0x74-0x77 */ -- 0x83, 0xC9, 0xFD, 0x9D, 0xC1, 0xBA, 0xBC, 0x5A, /* 0x78-0x7B */ -- 0xC1, 0xBC, 0xD5, 0x8F, 0xC1, 0xBF, 0x84, 0xEE, /* 0x7C-0x7F */ -- -- 0x85, 0xCE, 0xC5, 0xAE, 0x8F, 0x5D, 0xC2, 0xC3, /* 0x80-0x83 */ -- 0x9E, 0x56, 0xB5, 0x5A, 0xE9, 0x82, 0xF3, 0x50, /* 0x84-0x87 */ -- 0xFB, 0x90, 0xC0, 0xE8, 0xC1, 0xA6, 0x95, 0xD1, /* 0x88-0x8B */ -- 0x9A, 0x76, 0xDE, 0x5D, 0xC4, 0xEA, 0x91, 0x7A, /* 0x8C-0x8F */ -- 0x91, 0xD9, 0x93, 0xD3, 0x9D, 0x69, 0x9F, 0x92, /* 0x90-0x93 */ -- 0xAD, 0x49, 0xFD, 0x9E, 0xBE, 0x9A, 0xC2, 0x93, /* 0x94-0x97 */ -- 0xDD, 0x82, 0xC9, 0x8F, 0xDF, 0x42, 0xE5, 0x80, /* 0x98-0x9B */ -- 0xC1, 0xD0, 0xC1, 0xD3, 0xD1, 0xCA, 0xC1, 0xD2, /* 0x9C-0x9F */ -- 0xC1, 0xD1, 0xD5, 0x66, 0xC1, 0xAE, 0xC4, 0xEE, /* 0xA0-0xA3 */ -- 0xC4, 0xED, 0x9A, 0x9A, 0xBA, 0x9F, 0xAB, 0x43, /* 0xA4-0xA7 */ -- 0xC1, 0xEE, 0xE0, 0xF2, 0x8C, 0x8E, 0x8E, 0x58, /* 0xA8-0xAB */ -- 0xC1, 0xAF, 0xC1, 0xE1, 0xAC, 0x93, 0xC1, 0xE7, /* 0xAC-0xAF */ -- 0xF1, 0xF6, 0xE2, 0x8F, 0xC1, 0xE3, 0xEC, 0x60, /* 0xB0-0xB3 */ -- 0xEE, 0x49, 0xC0, 0xFD, 0xB6, 0x59, 0xF5, 0xB7, /* 0xB4-0xB7 */ -- 0xEB, 0x60, 0x90, 0xBA, 0xC1, 0xCB, 0xC1, 0xC5, /* 0xB8-0xBB */ -- 0xE5, 0xBC, 0xC4, 0xF2, 0xC1, 0xCF, 0x98, 0xB7, /* 0xBC-0xBF */ -- 0xC1, 0xC7, 0xAF, 0x9F, 0xDE, 0xA4, 0xDF, 0x7C, /* 0xC0-0xC3 */ -- 0xFD, 0x88, 0x95, 0x9E, 0xC8, 0xEE, 0x84, 0xA2, /* 0xC4-0xC7 */ -- 0x96, 0x83, 0xC1, 0xF8, 0xC1, 0xF7, 0xC1, 0xEF, /* 0xC8-0xCB */ -- 0xC1, 0xF0, 0xC1, 0xF4, 0xC1, 0xF2, 0xBC, 0x7E, /* 0xCC-0xCF */ -- 0xEE, 0x90, 0xC1, 0xF9, 0xC2, 0xBE, 0xEA, 0x91, /* 0xD0-0xD3 */ -- 0x82, 0x90, 0x8D, 0x91, 0x9C, 0x53, 0xDD, 0x86, /* 0xD4-0xD7 */ -- 0xC2, 0xC9, 0x90, 0xFC, 0xC0, 0xF5, 0xC2, 0xCA, /* 0xD8-0xDB */ -- 0xC2, 0xA1, 0xC0, 0xFB, 0xC0, 0xF4, 0xC2, 0xC4, /* 0xDC-0xDF */ -- 0xD2, 0xD7, 0xC0, 0xEE, 0xC0, 0xE6, 0xC4, 0xE0, /* 0xE0-0xE3 */ -- 0xC0, 0xED, 0xC1, 0xA1, 0xEE, 0xBE, 0xFD, 0x9F, /* 0xE4-0xE7 */ -- 0xD1, 0x65, 0xC0, 0xEF, 0xEB, 0x78, 0xC4, 0xE4, /* 0xE8-0xEB */ -- 0xC4, 0xE7, 0xC1, 0xDF, 0x9F, 0xFB, 0xAD, 0x55, /* 0xEC-0xEF */ -- 0xCC, 0x41, 0xFD, 0xA0, 0xF7, 0x5B, 0xF7, 0xEB, /* 0xF0-0xF3 */ -- 0xC1, 0xD6, 0xC1, 0xDC, 0xC5, 0x52, 0xC1, 0xA2, /* 0xF4-0xF7 */ -- 0xF3, 0xD2, 0xC1, 0xA3, 0xA0, 0xEE, 0xD6, 0xCB, /* 0xF8-0xFB */ -- 0xD7, 0x52, 0xCA, 0xB2, 0xB2, 0xE8, 0xB4, 0xCC, /* 0xFC-0xFF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -+ 0xFD, 0x9C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ -+ 0x00, 0x00, 0xFD, 0x9D, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ -+ 0x00, 0x00, 0xFD, 0x9E, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xAC-0xAF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB4-0xB7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD4-0xD7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0x9F, /* 0xE4-0xE7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE8-0xEB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ -+ 0x00, 0x00, 0xFD, 0xA0, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ - }; - - static unsigned char u2c_FA[512] = { -- 0xC7, 0xD0, 0xB6, 0xC8, 0xCD, 0xD8, 0xCC, 0xC7, /* 0x00-0x03 */ -- 0xD5, 0xAC, 0xB6, 0xB4, 0xB1, 0xA9, 0xDD, 0x97, /* 0x04-0x07 */ -- 0xD0, 0xD0, 0xBD, 0xB5, 0xD2, 0x8A, 0xC0, 0xAA, /* 0x08-0x0B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0xFE, 0x40, 0xFE, 0x41, 0xFE, 0x42, 0xFE, 0x43, /* 0x0C-0x0F */ -- 0x89, 0x56, 0xFE, 0x44, 0xC7, 0xE7, 0xFE, 0x45, /* 0x10-0x13 */ -- 0xFE, 0x46, 0x84, 0x44, 0xD8, 0x69, 0xD2, 0xE6, /* 0x14-0x17 */ -- 0xFE, 0x47, 0xC9, 0xF1, 0xCF, 0xE9, 0xB8, 0xA3, /* 0x18-0x1B */ -- 0xBE, 0xB8, 0xBE, 0xAB, 0xD3, 0xF0, 0xFE, 0x48, /* 0x1C-0x1F */ -- 0xFE, 0x49, 0xFE, 0x4A, 0xD6, 0x54, 0xFE, 0x4B, /* 0x20-0x23 */ -- 0xFE, 0x4C, 0xD2, 0xDD, 0xB6, 0xBC, 0xFE, 0x4D, /* 0x24-0x27 */ -- 0xFE, 0x4E, 0xFE, 0x4F, 0xEF, 0x88, 0xEF, 0x95, /* 0x28-0x2B */ -- 0xF0, 0x5E, 0xFA, 0x51, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -+ 0x00, 0x00, 0xFE, 0x44, 0x00, 0x00, 0xFE, 0x45, /* 0x10-0x13 */ -+ 0xFE, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -+ 0xFE, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x48, /* 0x1C-0x1F */ -+ 0xFE, 0x49, 0xFE, 0x4A, 0x00, 0x00, 0xFE, 0x4B, /* 0x20-0x23 */ -+ 0xFE, 0x4C, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x4D, /* 0x24-0x27 */ -+ 0xFE, 0x4E, 0xFE, 0x4F, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ - }; - - static unsigned char u2c_FE[512] = { -@@ -10836,7 +10848,7 @@ - }; - - static unsigned char *page_uni2charset[256] = { -- NULL, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, -+ u2c_00, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -@@ -10863,11 +10875,12 @@ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, }; -+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -+ NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, -+}; - - static unsigned char charset2lower[256] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */ -@@ -10952,22 +10965,23 @@ - if (boundlen <= 0) - return -ENAMETOOLONG; - -- -- uni2charset = page_uni2charset[ch]; -- if (uni2charset) { -- if (boundlen <= 1) -- return -ENAMETOOLONG; -- out[0] = uni2charset[cl*2]; -- out[1] = uni2charset[cl*2+1]; -- if (out[0] == 0x00 && out[1] == 0x00) -+ if (ch==0 && cl<0x80) { -+ out[0] = cl; -+ n = 1; -+ } else { -+ -+ uni2charset = page_uni2charset[ch]; -+ if (uni2charset) { -+ if (boundlen <= 1) -+ return -ENAMETOOLONG; -+ out[0] = uni2charset[cl*2]; -+ out[1] = uni2charset[cl*2+1]; -+ if (out[0] == 0x00 && out[1] == 0x00) -+ return -EINVAL; -+ n = 2; -+ } else - return -EINVAL; -- n = 2; -- } else if (ch==0 && cl) { -- out[0] = cl; -- n = 1; -- } -- else -- return -EINVAL; -+ } - - return n; - } -@@ -10991,7 +11005,7 @@ - cl = rawstring[1]; - - charset2uni = page_charset2uni[ch]; -- if (charset2uni && cl) { -+ if (charset2uni && (rawstring[1]>=0xA1 && rawstring[1]<=0xFE) && cl) { - *uni = charset2uni[cl]; - if (*uni == 0x0000) - return -EINVAL; -@@ -11026,20 +11040,4 @@ - module_exit(exit_nls_cp936) - MODULE_LICENSE("Dual BSD/GPL"); - --/* -- * Overrides for Emacs so that we follow Linus's tabbing style. -- * Emacs will notice this stuff at the end of the file and automatically -- * adjust the settings for this buffer only. This must remain at the end -- * of the file. -- * ----------------------------------------------------------------------------- -- * Local variables: -- * c-indent-level: 8 -- * c-brace-imaginary-offset: 0 -- * c-brace-offset: -8 -- * c-argdecl-indent: 8 -- * c-label-offset: -8 -- * c-continued-statement-offset: 8 -- * c-continued-brace-offset: 0 -- * End: -- */ -+ ---- R29/fs/nls/nls_cp949.c 2004-03-24 19:56:03.000000000 +0000 -+++ R63/fs/nls/nls_cp949.c 2005-08-09 03:33:28.000000000 +0100 -@@ -3,8 +3,10 @@ - * - * Charset cp949 translation tables. - * This translation table was generated automatically, the -- * original table can be download from the Microsoft website. -- * (http://www.microsoft.com/typography/unicode/unicodecp.htm) -+ * original table can be found at the Microsoft website. -+ * (http://www.microsoft.com/globaldev/reference/dbcs/949.htm) -+ * download CP949.TXT from MIT Edu website -+ * (http://web.mit.edu/afs/dev.mit.edu/source/src-current/third/libiconv/tests/CP949.TXT) - */ - - #include <linux/module.h> -@@ -1231,7 +1233,7 @@ - 0x25A5,0x25A8,0x25A7,0x25A6,0x25A9,0x2668,0x260F,0x260E,/* 0xC8-0xCF */ - 0x261C,0x261E,0x00B6,0x2020,0x2021,0x2195,0x2197,0x2199,/* 0xD0-0xD7 */ - 0x2196,0x2198,0x266D,0x2669,0x266A,0x266C,0x327F,0x321C,/* 0xD8-0xDF */ -- 0x2116,0x33C7,0x2122,0x33C2,0x33D8,0x2121,0x0000,0x0000,/* 0xE0-0xE7 */ -+ 0x2116,0x33C7,0x2122,0x33C2,0x33D8,0x2121,0x20AC,0x00AE,/* 0xE0-0xE7 */ - }; - - static wchar_t c2u_A3[256] = { -@@ -1292,13 +1294,13 @@ - 0xCA2E,0xCA2F,0xCA30,0xCA31,0xCA32,0xCA33,0xCA34,0xCA35,/* 0x88-0x8F */ - 0xCA36,0xCA37,0xCA38,0xCA39,0xCA3A,0xCA3B,0xCA3C,0xCA3D,/* 0x90-0x97 */ - 0xCA3E,0xCA3F,0xCA40,0xCA41,0xCA42,0xCA43,0xCA44,0xCA45,/* 0x98-0x9F */ -- 0xCA46,0xFFA1,0xFFA2,0xFFA3,0xFFA4,0xFFA5,0xFFA6,0xFFA7,/* 0xA0-0xA7 */ -- 0xFFA8,0xFFA9,0xFFAA,0xFFAB,0xFFAC,0xFFAD,0xFFAE,0xFFAF,/* 0xA8-0xAF */ -- 0xFFB0,0xFFB1,0xFFB2,0xFFB3,0xFFB4,0xFFB5,0xFFB6,0xFFB7,/* 0xB0-0xB7 */ -- 0xFFB8,0xFFB9,0xFFBA,0xFFBB,0xFFBC,0xFFBD,0xFFBE,0xFFC2,/* 0xB8-0xBF */ -- 0xFFC3,0xFFC4,0xFFC5,0xFFC6,0xFFC7,0xFFCA,0xFFCB,0xFFCC,/* 0xC0-0xC7 */ -- 0xFFCD,0xFFCE,0xFFCF,0xFFD2,0xFFD3,0xFFD4,0xFFD5,0xFFD6,/* 0xC8-0xCF */ -- 0xFFD7,0xFFDA,0xFFDB,0xFFDC,0xFFA0,0x3165,0x3166,0x3167,/* 0xD0-0xD7 */ -+ 0xCA46,0x3131,0x3132,0x3133,0x3134,0x3135,0x3136,0x3137,/* 0xA0-0xA7 */ -+ 0x3138,0x3139,0x313A,0x313B,0x313C,0x313D,0x313E,0x313F,/* 0xA8-0xAF */ -+ 0x3140,0x3141,0x3142,0x3143,0x3144,0x3145,0x3146,0x3147,/* 0xB0-0xB7 */ -+ 0x3148,0x3149,0x314A,0x314B,0x314C,0x314D,0x314E,0x314F,/* 0xB8-0xBF */ -+ 0x3150,0x3151,0x3152,0x3153,0x3154,0x3155,0x3156,0x3157,/* 0xC0-0xC7 */ -+ 0x3158,0x3159,0x315A,0x315B,0x315C,0x315D,0x315E,0x315F,/* 0xC8-0xCF */ -+ 0x3160,0x3161,0x3162,0x3163,0x3164,0x3165,0x3166,0x3167,/* 0xD0-0xD7 */ - 0x3168,0x3169,0x316A,0x316B,0x316C,0x316D,0x316E,0x316F,/* 0xD8-0xDF */ - 0x3170,0x3171,0x3172,0x3173,0x3174,0x3175,0x3176,0x3177,/* 0xE0-0xE7 */ - 0x3178,0x3179,0x317A,0x317B,0x317C,0x317D,0x317E,0x317F,/* 0xE8-0xEF */ -@@ -2730,7 +2732,7 @@ - 0x0000,0x79D1,0x83D3,0x8A87,0x8AB2,0x8DE8,0x904E,0x934B,/* 0xA0-0xA7 */ - 0x9846,0x5ED3,0x69E8,0x85FF,0x90ED,0xF905,0x51A0,0x5B98,/* 0xA8-0xAF */ - 0x5BEC,0x6163,0x68FA,0x6B3E,0x704C,0x742F,0x74D8,0x7BA1,/* 0xB0-0xB7 */ -- 0x7F50,0x83C5,0x89C0,0x8CAB,0x95DC,0xFA2C,0x522E,0x605D,/* 0xB8-0xBF */ -+ 0x7F50,0x83C5,0x89C0,0x8CAB,0x95DC,0x9928,0x522E,0x605D,/* 0xB8-0xBF */ - 0x62EC,0x9002,0x4F8A,0x5149,0x5321,0x58D9,0x5EE3,0x66E0,/* 0xC0-0xC7 */ - 0x6D38,0x709A,0x72C2,0x73D6,0x7B50,0x80F1,0x945B,0x5366,/* 0xC8-0xCF */ - 0x639B,0x7F6B,0x4E56,0x5080,0x584A,0x58DE,0x602A,0x6127,/* 0xD0-0xD7 */ -@@ -2945,7 +2947,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x68F9,0x6AC2,0x6DD8,0x6E21,0x6ED4,0x6FE4,0x71FE,/* 0xA0-0xA7 */ - 0x76DC,0x7779,0x79B1,0x7A3B,0x8404,0x89A9,0x8CED,0x8DF3,/* 0xA8-0xAF */ -- 0x8E48,0x9003,0x9014,0x9053,0xFA26,0x934D,0x9676,0x97DC,/* 0xB0-0xB7 */ -+ 0x8E48,0x9003,0x9014,0x9053,0x90FD,0x934D,0x9676,0x97DC,/* 0xB0-0xB7 */ - 0x6BD2,0x7006,0x7258,0x72A2,0x7368,0x7763,0x79BF,0x7BE4,/* 0xB8-0xBF */ - 0x7E9B,0x8B80,0x58A9,0x60C7,0x6566,0x65FD,0x66BE,0x6C8C,/* 0xC0-0xC7 */ - 0x711E,0x71C9,0x8C5A,0x9813,0x4E6D,0x7A81,0x4EDD,0x51AC,/* 0xC8-0xCF */ -@@ -3170,7 +3172,7 @@ - 0x99C1,0x4F34,0x534A,0x53CD,0x53DB,0x62CC,0x642C,0x6500,/* 0xE0-0xE7 */ - 0x6591,0x69C3,0x6CEE,0x6F58,0x73ED,0x7554,0x7622,0x76E4,/* 0xE8-0xEF */ - 0x76FC,0x78D0,0x78FB,0x792C,0x7D46,0x822C,0x87E0,0x8FD4,/* 0xF0-0xF7 */ -- 0x9812,0xFA2A,0x52C3,0x62D4,0x64A5,0x6E24,0x6F51,0x0000,/* 0xF8-0xFF */ -+ 0x9812,0x98EF,0x52C3,0x62D4,0x64A5,0x6E24,0x6F51,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_DB[256] = { -@@ -3238,7 +3240,7 @@ - 0x9A08,0x4FDD,0x5821,0x5831,0x5BF6,0x666E,0x6B65,0x6D11,/* 0xC0-0xC7 */ - 0x6E7A,0x6F7D,0x73E4,0x752B,0x83E9,0x88DC,0x8913,0x8B5C,/* 0xC8-0xCF */ - 0x8F14,0x4F0F,0x50D5,0x5310,0x535C,0x5B93,0x5FA9,0x670D,/* 0xD0-0xD7 */ -- 0xFA1B,0x8179,0x832F,0x8514,0x8907,0x8986,0x8F39,0x8F3B,/* 0xD8-0xDF */ -+ 0x798F,0x8179,0x832F,0x8514,0x8907,0x8986,0x8F39,0x8F3B,/* 0xD8-0xDF */ - 0x99A5,0x9C12,0x672C,0x4E76,0x4FF8,0x5949,0x5C01,0x5CEF,/* 0xE0-0xE7 */ - 0x5CF0,0x6367,0x68D2,0x70FD,0x71A2,0x742B,0x7E2B,0x84EC,/* 0xE8-0xEF */ - 0x8702,0x9022,0x92D2,0x9CF3,0x4E0D,0x4ED8,0x4FEF,0x5085,/* 0xF0-0xF7 */ -@@ -3314,7 +3316,7 @@ - 0x6E23,0x7009,0x7345,0x7802,0x793E,0x7940,0x7960,0x79C1,/* 0xE0-0xE7 */ - 0x7BE9,0x7D17,0x7D72,0x8086,0x820D,0x838E,0x84D1,0x86C7,/* 0xE8-0xEF */ - 0x88DF,0x8A50,0x8A5E,0x8B1D,0x8CDC,0x8D66,0x8FAD,0x90AA,/* 0xF0-0xF7 */ -- 0xFA2B,0x99DF,0x9E9D,0x524A,0xF969,0x6714,0xF96A,0x0000,/* 0xF8-0xFF */ -+ 0x98FC,0x99DF,0x9E9D,0x524A,0xF969,0x6714,0xF96A,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_DF[256] = { -@@ -3345,7 +3347,7 @@ - 0x8518,0x886B,0x63F7,0x6F81,0x9212,0x98AF,0x4E0A,0x50B7,/* 0xB8-0xBF */ - 0x50CF,0x511F,0x5546,0x55AA,0x5617,0x5B40,0x5C19,0x5CE0,/* 0xC0-0xC7 */ - 0x5E38,0x5E8A,0x5EA0,0x5EC2,0x60F3,0x6851,0x6A61,0x6E58,/* 0xC8-0xCF */ -- 0x723D,0x7240,0x72C0,0x76F8,0xFA1A,0x7BB1,0x7FD4,0x88F3,/* 0xD0-0xD7 */ -+ 0x723D,0x7240,0x72C0,0x76F8,0x7965,0x7BB1,0x7FD4,0x88F3,/* 0xD0-0xD7 */ - 0x89F4,0x8A73,0x8C61,0x8CDE,0x971C,0x585E,0x74BD,0x8CFD,/* 0xD8-0xDF */ - 0x55C7,0xF96C,0x7A61,0x7D22,0x8272,0x7272,0x751F,0x7525,/* 0xE0-0xE7 */ - 0xF96D,0x7B19,0x5885,0x58FB,0x5DBC,0x5E8F,0x5EB6,0x5F90,/* 0xE8-0xEF */ -@@ -3492,7 +3494,7 @@ - 0x57F4,0x5BD4,0x5F0F,0x606F,0x62ED,0x690D,0x6B96,0x6E5C,/* 0xD0-0xD7 */ - 0x7184,0x7BD2,0x8755,0x8B58,0x8EFE,0x98DF,0x98FE,0x4F38,/* 0xD8-0xDF */ - 0x4F81,0x4FE1,0x547B,0x5A20,0x5BB8,0x613C,0x65B0,0x6668,/* 0xE0-0xE7 */ -- 0x71FC,0x7533,0xFA19,0x7D33,0x814E,0x81E3,0x8398,0x85AA,/* 0xE8-0xEF */ -+ 0x71FC,0x7533,0x795E,0x7D33,0x814E,0x81E3,0x8398,0x85AA,/* 0xE8-0xEF */ - 0x85CE,0x8703,0x8A0A,0x8EAB,0x8F9B,0xF971,0x8FC5,0x5931,/* 0xF0-0xF7 */ - 0x5BA4,0x5BE6,0x6089,0x5BE9,0x5C0B,0x5FC3,0x6C81,0x0000,/* 0xF8-0xFF */ - }; -@@ -3665,7 +3667,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x70CF,0x71AC,0x7352,0x7B7D,0x8708,0x8AA4,0x9C32,/* 0xA0-0xA7 */ - 0x9F07,0x5C4B,0x6C83,0x7344,0x7389,0x923A,0x6EAB,0x7465,/* 0xA8-0xAF */ -- 0x761F,0x7A69,0x7E15,0x860A,0xFA0C,0x58C5,0x64C1,0x74EE,/* 0xB0-0xB7 */ -+ 0x761F,0x7A69,0x7E15,0x860A,0x5140,0x58C5,0x64C1,0x74EE,/* 0xB0-0xB7 */ - 0x7515,0x7670,0x7FC1,0x9095,0x96CD,0x9954,0x6E26,0x74E6,/* 0xB8-0xBF */ - 0x7AA9,0x7AAA,0x81E5,0x86D9,0x8778,0x8A1B,0x5A49,0x5B8C,/* 0xC0-0xC7 */ - 0x5B9B,0x68A1,0x6900,0x6D63,0x73A9,0x7413,0x742C,0x7897,/* 0xC8-0xCF */ -@@ -3707,7 +3709,7 @@ - 0x84C9,0x8E0A,0x9394,0x93DE,0xF9C4,0x4E8E,0x4F51,0x5076,/* 0xC8-0xCF */ - 0x512A,0x53C8,0x53CB,0x53F3,0x5B87,0x5BD3,0x5C24,0x611A,/* 0xD0-0xD7 */ - 0x6182,0x65F4,0x725B,0x7397,0x7440,0x76C2,0x7950,0x7991,/* 0xD8-0xDF */ -- 0x79B9,0x7D06,0xFA1E,0x828B,0x85D5,0x865E,0x8FC2,0x9047,/* 0xE0-0xE7 */ -+ 0x79B9,0x7D06,0x7FBD,0x828B,0x85D5,0x865E,0x8FC2,0x9047,/* 0xE0-0xE7 */ - 0x90F5,0x91EA,0x9685,0x96E8,0x96E9,0x52D6,0x5F67,0x65ED,/* 0xE8-0xEF */ - 0x6631,0x682F,0x715C,0x7A36,0x90C1,0x980A,0x4E91,0xF9C5,/* 0xF0-0xF7 */ - 0x6A52,0x6B9E,0x6F90,0x7189,0x8018,0x82B8,0x8553,0x0000,/* 0xF8-0xFF */ -@@ -3812,11 +3814,11 @@ - 0xF9E1,0xF9E2,0xF9E3,0x723E,0x73E5,0xF9E4,0x7570,0x75CD,/* 0xB0-0xB7 */ - 0xF9E5,0x79FB,0xF9E6,0x800C,0x8033,0x8084,0x82E1,0x8351,/* 0xB8-0xBF */ - 0xF9E7,0xF9E8,0x8CBD,0x8CB3,0x9087,0xF9E9,0xF9EA,0x98F4,/* 0xC0-0xC7 */ -- 0x990C,0xF9EB,0xF9EC,0x7037,0xFA17,0x7FCA,0x7FCC,0x7FFC,/* 0xC8-0xCF */ -+ 0x990C,0xF9EB,0xF9EC,0x7037,0x76CA,0x7FCA,0x7FCC,0x7FFC,/* 0xC8-0xCF */ - 0x8B1A,0x4EBA,0x4EC1,0x5203,0x5370,0xF9ED,0x54BD,0x56E0,/* 0xD0-0xD7 */ - 0x59FB,0x5BC5,0x5F15,0x5FCD,0x6E6E,0xF9EE,0xF9EF,0x7D6A,/* 0xD8-0xDF */ - 0x8335,0xF9F0,0x8693,0x8A8D,0xF9F1,0x976D,0x9777,0xF9F2,/* 0xE0-0xE7 */ -- 0xF9F3,0x4E00,0x4F5A,0x4F7E,0x58F9,0x65E5,0x6EA2,0xFA25,/* 0xE8-0xEF */ -+ 0xF9F3,0x4E00,0x4F5A,0x4F7E,0x58F9,0x65E5,0x6EA2,0x9038,/* 0xE8-0xEF */ - 0x93B0,0x99B9,0x4EFB,0x58EC,0x598A,0x59D9,0x6041,0xF9F4,/* 0xF0-0xF7 */ - 0xF9F5,0x7A14,0xF9F6,0x834F,0x8CC3,0x5165,0x5344,0x0000,/* 0xF8-0xFF */ - }; -@@ -3925,8 +3927,8 @@ - 0x633A,0x653F,0x6574,0x65CC,0x6676,0x6678,0x67FE,0x6968,/* 0xD8-0xDF */ - 0x6A89,0x6B63,0x6C40,0x6DC0,0x6DE8,0x6E1F,0x6E5E,0x701E,/* 0xE0-0xE7 */ - 0x70A1,0x738E,0x73FD,0x753A,0x775B,0x7887,0x798E,0x7A0B,/* 0xE8-0xEF */ -- 0x7A7D,0xFA1D,0x7D8E,0x8247,0x8A02,0x8AEA,0x8C9E,0x912D,/* 0xF0-0xF7 */ -- 0x914A,0x91D8,0x9266,0x92CC,0x9320,0x9706,0xFA1C,0x0000,/* 0xF8-0xFF */ -+ 0x7A7D,0x7CBE,0x7D8E,0x8247,0x8A02,0x8AEA,0x8C9E,0x912D,/* 0xF0-0xF7 */ -+ 0x914A,0x91D8,0x9266,0x92CC,0x9320,0x9706,0x9756,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_F0[256] = { -@@ -3953,7 +3955,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x975C,0x9802,0x9F0E,0x5236,0x5291,0x557C,0x5824,/* 0xA0-0xA7 */ - 0x5E1D,0x5F1F,0x608C,0x63D0,0x68AF,0x6FDF,0x796D,0x7B2C,/* 0xA8-0xAF */ -- 0x81CD,0x85BA,0x88FD,0xFA22,0x8E44,0x918D,0x9664,0x969B,/* 0xB0-0xB7 */ -+ 0x81CD,0x85BA,0x88FD,0x8AF8,0x8E44,0x918D,0x9664,0x969B,/* 0xB0-0xB7 */ - 0x973D,0x984C,0x9F4A,0x4FCE,0x5146,0x51CB,0x52A9,0x5632,/* 0xB8-0xBF */ - 0x5F14,0x5F6B,0x63AA,0x64CD,0x65E9,0x6641,0x66FA,0x66F9,/* 0xC0-0xC7 */ - 0x671D,0x689D,0x68D7,0x69FD,0x6F15,0x6F6E,0x7167,0x71E5,/* 0xC8-0xCF */ -@@ -4103,7 +4105,7 @@ - 0x51F8,0x54F2,0x5586,0x5FB9,0x64A4,0x6F88,0x7DB4,0x8F1F,/* 0xC8-0xCF */ - 0x8F4D,0x9435,0x50C9,0x5C16,0x6CBE,0x6DFB,0x751B,0x77BB,/* 0xD0-0xD7 */ - 0x7C3D,0x7C64,0x8A79,0x8AC2,0x581E,0x59BE,0x5E16,0x6377,/* 0xD8-0xDF */ -- 0x7252,0x758A,0x776B,0x8ADC,0x8CBC,0x8F12,0x5EF3,0xFA12,/* 0xE0-0xE7 */ -+ 0x7252,0x758A,0x776B,0x8ADC,0x8CBC,0x8F12,0x5EF3,0x6674,/* 0xE0-0xE7 */ - 0x6DF8,0x807D,0x83C1,0x8ACB,0x9751,0x9BD6,0xFA00,0x5243,/* 0xE8-0xEF */ - 0x66FF,0x6D95,0x6EEF,0x7DE0,0x8AE6,0x902E,0x905E,0x9AD4,/* 0xF0-0xF7 */ - 0x521D,0x527F,0x54E8,0x6194,0x6284,0x62DB,0x68A2,0x0000,/* 0xF8-0xFF */ -@@ -4135,7 +4137,7 @@ - 0x790E,0x79D2,0x7A0D,0x8096,0x8278,0x82D5,0x8349,0x8549,/* 0xA8-0xAF */ - 0x8C82,0x8D85,0x9162,0x918B,0x91AE,0x4FC3,0x56D1,0x71ED,/* 0xB0-0xB7 */ - 0x77D7,0x8700,0x89F8,0x5BF8,0x5FD6,0x6751,0x90A8,0x53E2,/* 0xB8-0xBF */ -- 0xFA10,0x5BF5,0x60A4,0x6181,0x6460,0x7E3D,0x8070,0x8525,/* 0xC0-0xC7 */ -+ 0x585A,0x5BF5,0x60A4,0x6181,0x6460,0x7E3D,0x8070,0x8525,/* 0xC0-0xC7 */ - 0x9283,0x64AE,0x50AC,0x5D14,0x6700,0x589C,0x62BD,0x63A8,/* 0xC8-0xCF */ - 0x690E,0x6978,0x6A1E,0x6E6B,0x76BA,0x79CB,0x82BB,0x8429,/* 0xD0-0xD7 */ - 0x8ACF,0x8DA8,0x8FFD,0x9112,0x914B,0x919C,0x9310,0x9318,/* 0xD8-0xDF */ -@@ -4280,7 +4282,7 @@ - 0x5F3C,0x5FC5,0x6CCC,0x73CC,0x7562,0x758B,0x7B46,0x82FE,/* 0xB0-0xB7 */ - 0x999D,0x4E4F,0x903C,0x4E0B,0x4F55,0x53A6,0x590F,0x5EC8,/* 0xB8-0xBF */ - 0x6630,0x6CB3,0x7455,0x8377,0x8766,0x8CC0,0x9050,0x971E,/* 0xC0-0xC7 */ -- 0x9C15,0x58D1,0x5B78,0x8650,0x8B14,0xFA2D,0x5BD2,0x6068,/* 0xC8-0xCF */ -+ 0x9C15,0x58D1,0x5B78,0x8650,0x8B14,0x9DB4,0x5BD2,0x6068,/* 0xC8-0xCF */ - 0x608D,0x65F1,0x6C57,0x6F22,0x6FA3,0x701A,0x7F55,0x7FF0,/* 0xD0-0xD7 */ - 0x9591,0x9592,0x9650,0x97D3,0x5272,0x8F44,0x51FD,0x542B,/* 0xD8-0xDF */ - 0x54B8,0x5563,0x558A,0x6ABB,0x6DB5,0x7DD8,0x8266,0x929C,/* 0xE0-0xE7 */ -@@ -4428,7 +4430,7 @@ - 0x8667,0x6064,0x8B4E,0x9DF8,0x5147,0x51F6,0x5308,0x6D36,/* 0xD0-0xD7 */ - 0x80F8,0x9ED1,0x6615,0x6B23,0x7098,0x75D5,0x5403,0x5C79,/* 0xD8-0xDF */ - 0x7D07,0x8A16,0x6B20,0x6B3D,0x6B46,0x5438,0x6070,0x6D3D,/* 0xE0-0xE7 */ -- 0x7FD5,0x8208,0x50D6,0xFA15,0x559C,0x566B,0x56CD,0x59EC,/* 0xE8-0xEF */ -+ 0x7FD5,0x8208,0x50D6,0x51DE,0x559C,0x566B,0x56CD,0x59EC,/* 0xE8-0xEF */ - 0x5B09,0x5E0C,0x6199,0x6198,0x6231,0x665E,0x66E6,0x7199,/* 0xF0-0xF7 */ - 0x71B9,0x71BA,0x72A7,0x79A7,0x7A00,0x7FB2,0x8A70,0x0000,/* 0xF8-0xFF */ - }; -@@ -4468,12 +4470,81 @@ - c2u_F8, c2u_F9, c2u_FA, c2u_FB, c2u_FC, c2u_FD, NULL, NULL, - }; - -+ -+static unsigned char u2c_00[512] = { -+ 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, /* 0x00-0x03 */ -+ 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, /* 0x04-0x07 */ -+ 0x00, 0x08, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, /* 0x08-0x0B */ -+ 0x00, 0x0C, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x0F, /* 0x0C-0x0F */ -+ 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, /* 0x10-0x13 */ -+ 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, /* 0x14-0x17 */ -+ 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, /* 0x18-0x1B */ -+ 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, /* 0x1C-0x1F */ -+ 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, /* 0x20-0x23 */ -+ 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, /* 0x24-0x27 */ -+ 0x00, 0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, /* 0x28-0x2B */ -+ 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2E, 0x00, 0x2F, /* 0x2C-0x2F */ -+ 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, /* 0x30-0x33 */ -+ 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, /* 0x34-0x37 */ -+ 0x00, 0x38, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3B, /* 0x38-0x3B */ -+ 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x3F, /* 0x3C-0x3F */ -+ 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, /* 0x40-0x43 */ -+ 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, /* 0x44-0x47 */ -+ 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, /* 0x48-0x4B */ -+ 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, /* 0x4C-0x4F */ -+ 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, /* 0x50-0x53 */ -+ 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, /* 0x54-0x57 */ -+ 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, /* 0x58-0x5B */ -+ 0x00, 0x5C, 0x00, 0x5D, 0x00, 0x5E, 0x00, 0x5F, /* 0x5C-0x5F */ -+ 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, /* 0x60-0x63 */ -+ 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, /* 0x64-0x67 */ -+ 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00, 0x6B, /* 0x68-0x6B */ -+ 0x00, 0x6C, 0x00, 0x6D, 0x00, 0x6E, 0x00, 0x6F, /* 0x6C-0x6F */ -+ 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, /* 0x70-0x73 */ -+ 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, /* 0x74-0x77 */ -+ 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, /* 0x78-0x7B */ -+ 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, /* 0x7C-0x7F */ -+ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -+ 0x00, 0x00, 0xA2, 0xAE, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ -+ 0xA2, 0xB4, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD7, /* 0xA4-0xA7 */ -+ 0xA1, 0xA7, 0x00, 0x00, 0xA8, 0xA3, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0x00, 0x00, 0xA1, 0xA9, 0xA2, 0xE7, 0x00, 0x00, /* 0xAC-0xAF */ -+ 0xA1, 0xC6, 0xA1, 0xBE, 0xA9, 0xF7, 0xA9, 0xF8, /* 0xB0-0xB3 */ -+ 0xA2, 0xA5, 0x00, 0x00, 0xA2, 0xD2, 0xA1, 0xA4, /* 0xB4-0xB7 */ -+ 0xA2, 0xAC, 0xA9, 0xF6, 0xA8, 0xAC, 0x00, 0x00, /* 0xB8-0xBB */ -+ 0xA8, 0xF9, 0xA8, 0xF6, 0xA8, 0xFA, 0xA2, 0xAF, /* 0xBC-0xBF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA1, 0x00, 0x00, /* 0xC4-0xC7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ -+ 0xA8, 0xA2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xBF, /* 0xD4-0xD7 */ -+ 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ -+ 0x00, 0x00, 0x00, 0x00, 0xA8, 0xAD, 0xA9, 0xAC, /* 0xDC-0xDF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ -+ 0x00, 0x00, 0x00, 0x00, 0xA9, 0xA1, 0x00, 0x00, /* 0xE4-0xE7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE8-0xEB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ -+ 0xA9, 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC0, /* 0xF4-0xF7 */ -+ 0xA9, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF8-0xFB */ -+ 0x00, 0x00, 0x00, 0x00, 0xA9, 0xAD, 0x00, 0x00, /* 0xFC-0xFF */ -+}; -+ - static unsigned char u2c_01[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ -- 0xA9, 0xA2, 0xA9, 0xA2, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ -+ 0x00, 0x00, 0xA9, 0xA2, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ -@@ -4636,72 +4707,6 @@ - 0x00, 0x00, 0xAC, 0xD7, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ - }; - --static unsigned char u2c_11[512] = { -- 0xA4, 0xA1, 0xA4, 0xA2, 0xA4, 0xA4, 0xA4, 0xA7, /* 0x00-0x03 */ -- 0xA4, 0xA8, 0xA4, 0xA9, 0xA4, 0xB1, 0xA4, 0xB2, /* 0x04-0x07 */ -- 0xA4, 0xB3, 0xA4, 0xB5, 0xA4, 0xB6, 0xA4, 0xB7, /* 0x08-0x0B */ -- 0xA4, 0xB8, 0xA4, 0xB9, 0xA4, 0xBA, 0xA4, 0xBB, /* 0x0C-0x0F */ -- 0xA4, 0xBC, 0xA4, 0xBD, 0xA4, 0xBE, 0x00, 0x00, /* 0x10-0x13 */ -- 0xA4, 0xD5, 0xA4, 0xD6, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xDD, 0x00, 0x00, /* 0x18-0x1B */ -- 0xA4, 0xDE, 0xA4, 0xE1, 0xA4, 0xE2, 0x00, 0x00, /* 0x1C-0x1F */ -- 0xA4, 0xE3, 0xA4, 0xB4, 0xA4, 0xE4, 0xA4, 0xE5, /* 0x20-0x23 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xE6, /* 0x24-0x27 */ -- 0x00, 0x00, 0xA4, 0xE7, 0x00, 0x00, 0xA4, 0xE8, /* 0x28-0x2B */ -- 0xA4, 0xE9, 0xA4, 0xEA, 0xA4, 0xEB, 0xA4, 0xEC, /* 0x2C-0x2F */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xED, 0x00, 0x00, /* 0x30-0x33 */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xEE, 0x00, 0x00, /* 0x34-0x37 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -- 0xA4, 0xB5, 0xA4, 0xB6, 0xA4, 0xB5, 0xA4, 0xB6, /* 0x3C-0x3F */ -- 0xA4, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ -- 0x00, 0x00, 0xA4, 0xF2, 0xA4, 0xF3, 0xA4, 0xF0, /* 0x44-0x47 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ -- 0xA4, 0xB7, 0x00, 0x00, 0xA4, 0xB8, 0xA4, 0xB9, /* 0x4C-0x4F */ -- 0xA4, 0xB8, 0xA4, 0xB9, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ -- 0xA4, 0xBA, 0xA4, 0xBA, 0x00, 0x00, 0xA4, 0xF4, /* 0x54-0x57 */ -- 0xA4, 0xF5, 0xA4, 0xF6, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xD4, /* 0x5C-0x5F */ -- 0x00, 0x00, 0xA4, 0xBF, 0xA4, 0xC0, 0xA4, 0xC1, /* 0x60-0x63 */ -- 0xA4, 0xC2, 0xA4, 0xC3, 0xA4, 0xC4, 0xA4, 0xC5, /* 0x64-0x67 */ -- 0xA4, 0xC6, 0xA4, 0xC7, 0xA4, 0xC8, 0xA4, 0xC9, /* 0x68-0x6B */ -- 0xA4, 0xCA, 0xA4, 0xCB, 0xA4, 0xCC, 0xA4, 0xCD, /* 0x6C-0x6F */ -- 0xA4, 0xCE, 0xA4, 0xCF, 0xA4, 0xD0, 0xA4, 0xD1, /* 0x70-0x73 */ -- 0xA4, 0xD2, 0xA4, 0xD3, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ -- -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -- 0xA4, 0xF7, 0xA4, 0xF8, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -- 0xA4, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -- 0x00, 0x00, 0xA4, 0xFA, 0xA4, 0xFB, 0x00, 0x00, /* 0x90-0x93 */ -- 0xA4, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xFD, 0x00, 0x00, /* 0x9C-0x9F */ -- 0x00, 0x00, 0xA4, 0xFE, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ -- 0xA4, 0xA1, 0xA4, 0xA2, 0xA4, 0xA3, 0xA4, 0xA4, /* 0xA8-0xAB */ -- 0xA4, 0xA5, 0xA4, 0xA6, 0xA4, 0xA7, 0xA4, 0xA9, /* 0xAC-0xAF */ -- 0xA4, 0xAA, 0xA4, 0xAB, 0xA4, 0xAC, 0xA4, 0xAD, /* 0xB0-0xB3 */ -- 0xA4, 0xAE, 0xA4, 0xAF, 0xA4, 0xB0, 0xA4, 0xB1, /* 0xB4-0xB7 */ -- 0xA4, 0xB2, 0xA4, 0xB4, 0xA4, 0xB5, 0xA4, 0xB6, /* 0xB8-0xBB */ -- 0xA4, 0xB7, 0xA4, 0xB8, 0xA4, 0xBA, 0xA4, 0xBB, /* 0xBC-0xBF */ -- 0xA4, 0xBC, 0xA4, 0xBD, 0xA4, 0xBE, 0x00, 0x00, /* 0xC0-0xC3 */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xD6, 0xA4, 0xD7, /* 0xC4-0xC7 */ -- 0xA4, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -- 0xA4, 0xD9, 0x00, 0x00, 0xA4, 0xDA, 0x00, 0x00, /* 0xCC-0xCF */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xDB, /* 0xD0-0xD3 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xDC, /* 0xD4-0xD7 */ -- 0x00, 0x00, 0xA4, 0xDD, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ -- 0xA4, 0xDE, 0xA4, 0xDF, 0x00, 0x00, 0xA4, 0xE0, /* 0xDC-0xDF */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xE8, 0xA4, 0xEA, /* 0xE4-0xE7 */ -- 0xA4, 0xEC, 0x00, 0x00, 0xA4, 0xED, 0xA4, 0xEF, /* 0xE8-0xEB */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xF0, 0x00, 0x00, /* 0xEC-0xEF */ -- 0xA4, 0xB7, 0xA4, 0xF2, 0xA4, 0xF3, 0x00, 0x00, /* 0xF0-0xF3 */ -- 0xA4, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF4-0xF7 */ -- 0x00, 0x00, 0xA4, 0xF6, 0x00, 0x00, 0x00, 0x00, /* 0xF8-0xFB */ --}; - - static unsigned char u2c_20[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ -@@ -4747,7 +4752,8 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ -- 0x00, 0x00, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0xA2, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xAC-0xAF */ - }; - - static unsigned char u2c_21[512] = { -@@ -4909,13 +4915,13 @@ - 0xA9, 0xD9, 0xA9, 0xDA, 0xA9, 0xDB, 0xA9, 0xDC, /* 0xA8-0xAB */ - 0xA9, 0xDD, 0xA9, 0xDE, 0xA9, 0xDF, 0xA9, 0xE0, /* 0xAC-0xAF */ - 0xA9, 0xE1, 0xA9, 0xE2, 0xA9, 0xE3, 0xA9, 0xE4, /* 0xB0-0xB3 */ -- 0xA9, 0xE5, 0xA9, 0xE6, 0xA8, 0xCD, 0xA8, 0xCE, /* 0xB4-0xB7 */ -- 0xA8, 0xCF, 0xA8, 0xD0, 0xA8, 0xD1, 0xA8, 0xD2, /* 0xB8-0xBB */ -- 0xA8, 0xD3, 0xA8, 0xD4, 0xA8, 0xD5, 0xA8, 0xD6, /* 0xBC-0xBF */ -- 0xA8, 0xD7, 0xA8, 0xD8, 0xA8, 0xD9, 0xA8, 0xDA, /* 0xC0-0xC3 */ -- 0xA8, 0xDB, 0xA8, 0xDC, 0xA8, 0xDD, 0xA8, 0xDE, /* 0xC4-0xC7 */ -- 0xA8, 0xDF, 0xA8, 0xE0, 0xA8, 0xE1, 0xA8, 0xE2, /* 0xC8-0xCB */ -- 0xA8, 0xE3, 0xA8, 0xE4, 0xA8, 0xE5, 0xA8, 0xE6, /* 0xCC-0xCF */ -+ 0xA9, 0xE5, 0xA9, 0xE6, 0x00, 0x00, 0x00, 0x00, /* 0xB4-0xB7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ - 0xA8, 0xCD, 0xA8, 0xCE, 0xA8, 0xCF, 0xA8, 0xD0, /* 0xD0-0xD3 */ - 0xA8, 0xD1, 0xA8, 0xD2, 0xA8, 0xD3, 0xA8, 0xD4, /* 0xD4-0xD7 */ - 0xA8, 0xD5, 0xA8, 0xD6, 0xA8, 0xD7, 0xA8, 0xD8, /* 0xD8-0xDB */ -@@ -5117,10 +5123,6 @@ - 0xA4, 0xF4, 0xA4, 0xF5, 0xA4, 0xF6, 0xA4, 0xF7, /* 0x84-0x87 */ - 0xA4, 0xF8, 0xA4, 0xF9, 0xA4, 0xFA, 0xA4, 0xFB, /* 0x88-0x8B */ - 0xA4, 0xFC, 0xA4, 0xFD, 0xA4, 0xFE, 0x00, 0x00, /* 0x8C-0x8F */ -- 0x00, 0x00, 0x00, 0x00, 0xEC, 0xE9, 0xEC, 0xA3, /* 0x90-0x93 */ -- 0xDF, 0xB2, 0xDE, 0xCC, 0xDF, 0xBE, 0xF1, 0xE9, /* 0x94-0x97 */ -- 0xF9, 0xBB, 0xCB, 0xA3, 0xEB, 0xE0, 0xDC, 0xB0, /* 0x98-0x9B */ -- 0xEF, 0xCB, 0xF4, 0xB8, 0xF2, 0xA2, 0xEC, 0xD1, /* 0x9C-0x9F */ - }; - - static unsigned char u2c_32[512] = { -@@ -5132,15 +5134,15 @@ - 0xA9, 0xC5, 0xA9, 0xC6, 0xA9, 0xC7, 0xA9, 0xC8, /* 0x14-0x17 */ - 0xA9, 0xC9, 0xA9, 0xCA, 0xA9, 0xCB, 0xA9, 0xCC, /* 0x18-0x1B */ - 0xA2, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ -- 0xEC, 0xE9, 0xEC, 0xA3, 0xDF, 0xB2, 0xDE, 0xCC, /* 0x20-0x23 */ -- 0xE7, 0xE9, 0xD7, 0xBF, 0xF6, 0xD2, 0xF8, 0xA2, /* 0x24-0x27 */ -- 0xCE, 0xFA, 0xE4, 0xA8, 0xEA, 0xC5, 0xFB, 0xFD, /* 0x28-0x2B */ -- 0xE2, 0xA9, 0xD9, 0xCA, 0xD1, 0xD1, 0xF7, 0xCF, /* 0x2C-0x2F */ -- 0xEC, 0xED, 0xF1, 0xBB, 0xEA, 0xF3, 0xDE, 0xE4, /* 0x30-0x33 */ -- 0xD9, 0xA3, 0xF7, 0xE5, 0xEE, 0xAF, 0xF5, 0xE6, /* 0x34-0x37 */ -- 0xD6, 0xCC, 0xD3, 0xDB, 0xFB, 0xBC, 0xF9, 0xCA, /* 0x38-0x3B */ -- 0xCA, 0xF8, 0xD0, 0xEA, 0xED, 0xC0, 0xFA, 0xF0, /* 0x3C-0x3F */ -- 0xF0, 0xAE, 0xFD, 0xCC, 0xED, 0xBB, 0xF2, 0xB8, /* 0x40-0x43 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -@@ -5156,20 +5158,6 @@ - 0xA8, 0xC5, 0xA8, 0xC6, 0xA8, 0xC7, 0xA8, 0xC8, /* 0x74-0x77 */ - 0xA8, 0xC9, 0xA8, 0xCA, 0xA8, 0xCB, 0xA8, 0xCC, /* 0x78-0x7B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xDE, /* 0x7C-0x7F */ -- -- 0xEC, 0xE9, 0xEC, 0xA3, 0xDF, 0xB2, 0xDE, 0xCC, /* 0x80-0x83 */ -- 0xE7, 0xE9, 0xD7, 0xBF, 0xF6, 0xD2, 0xF8, 0xA2, /* 0x84-0x87 */ -- 0xCE, 0xFA, 0xE4, 0xA8, 0xEA, 0xC5, 0xFB, 0xFD, /* 0x88-0x8B */ -- 0xE2, 0xA9, 0xD9, 0xCA, 0xD1, 0xD1, 0xF7, 0xCF, /* 0x8C-0x8F */ -- 0xEC, 0xED, 0xF1, 0xBB, 0xEA, 0xF3, 0xDE, 0xE4, /* 0x90-0x93 */ -- 0xD9, 0xA3, 0xF7, 0xE5, 0xEE, 0xAF, 0xF5, 0xE6, /* 0x94-0x97 */ -- 0xD6, 0xCC, 0xDD, 0xFA, 0xD1, 0xFB, 0xD2, 0xB3, /* 0x98-0x9B */ -- 0xEE, 0xEA, 0xE9, 0xD0, 0xEC, 0xD4, 0xF1, 0xBC, /* 0x9C-0x9F */ -- 0xFA, 0xA3, 0xFD, 0xCC, 0xDE, 0xD0, 0xEF, 0xE1, /* 0xA0-0xA3 */ -- 0xDF, 0xBE, 0xF1, 0xE9, 0xF9, 0xBB, 0xF1, 0xA7, /* 0xA4-0xA7 */ -- 0xE9, 0xD3, 0xEC, 0xA2, 0xF0, 0xF3, 0xF9, 0xCA, /* 0xA8-0xAB */ -- 0xCA, 0xF8, 0xD0, 0xEA, 0xED, 0xC0, 0xFA, 0xF0, /* 0xAC-0xAF */ -- 0xE5, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ - }; - - static unsigned char u2c_33[512] = { -@@ -13603,10 +13591,6 @@ - 0xC6, 0x4F, 0xC6, 0x50, 0xC6, 0x51, 0xC6, 0x52, /* 0xA0-0xA3 */ - }; - --static unsigned char u2c_DC[512] = { -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ --}; -- - static unsigned char u2c_F9[512] = { - 0xCB, 0xD0, 0xCB, 0xD6, 0xCB, 0xE7, 0xCD, 0xCF, /* 0x00-0x03 */ - 0xCD, 0xE8, 0xCE, 0xAD, 0xCF, 0xFB, 0xD0, 0xA2, /* 0x04-0x07 */ -@@ -13679,15 +13663,6 @@ - 0xF4, 0xEE, 0xF6, 0xF4, 0xF6, 0xF6, 0xF7, 0xB8, /* 0x00-0x03 */ - 0xF7, 0xC8, 0xF7, 0xD3, 0xF8, 0xDB, 0xF8, 0xF0, /* 0x04-0x07 */ - 0xFA, 0xA1, 0xFA, 0xA2, 0xFA, 0xE6, 0xFC, 0xA9, /* 0x08-0x0B */ -- 0xE8, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ -- 0xF5, 0xC0, 0x00, 0x00, 0xF4, 0xE7, 0x00, 0x00, /* 0x10-0x13 */ -- 0x00, 0x00, 0xFD, 0xEB, 0x00, 0x00, 0xEC, 0xCC, /* 0x14-0x17 */ -- 0x00, 0x00, 0xE3, 0xEA, 0xDF, 0xD4, 0xDC, 0xD8, /* 0x18-0x1B */ -- 0xEF, 0xFE, 0xEF, 0xF1, 0xE9, 0xE2, 0x00, 0x00, /* 0x1C-0x1F */ -- 0x00, 0x00, 0x00, 0x00, 0xF0, 0xB3, 0x00, 0x00, /* 0x20-0x23 */ -- 0x00, 0x00, 0xEC, 0xEF, 0xD4, 0xB4, 0x00, 0x00, /* 0x24-0x27 */ -- 0x00, 0x00, 0x00, 0x00, 0xDA, 0xF9, 0xDE, 0xF8, /* 0x28-0x2B */ -- 0xCE, 0xBD, 0xF9, 0xCD, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ - }; - - static unsigned char u2c_FF[512] = { -@@ -13732,30 +13707,30 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -- 0xA4, 0xD4, 0xA4, 0xA1, 0xA4, 0xA2, 0xA4, 0xA3, /* 0xA0-0xA3 */ -- 0xA4, 0xA4, 0xA4, 0xA5, 0xA4, 0xA6, 0xA4, 0xA7, /* 0xA4-0xA7 */ -- 0xA4, 0xA8, 0xA4, 0xA9, 0xA4, 0xAA, 0xA4, 0xAB, /* 0xA8-0xAB */ -- 0xA4, 0xAC, 0xA4, 0xAD, 0xA4, 0xAE, 0xA4, 0xAF, /* 0xAC-0xAF */ -- 0xA4, 0xB0, 0xA4, 0xB1, 0xA4, 0xB2, 0xA4, 0xB3, /* 0xB0-0xB3 */ -- 0xA4, 0xB4, 0xA4, 0xB5, 0xA4, 0xB6, 0xA4, 0xB7, /* 0xB4-0xB7 */ -- 0xA4, 0xB8, 0xA4, 0xB9, 0xA4, 0xBA, 0xA4, 0xBB, /* 0xB8-0xBB */ -- 0xA4, 0xBC, 0xA4, 0xBD, 0xA4, 0xBE, 0x00, 0x00, /* 0xBC-0xBF */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xBF, 0xA4, 0xC0, /* 0xC0-0xC3 */ -- 0xA4, 0xC1, 0xA4, 0xC2, 0xA4, 0xC3, 0xA4, 0xC4, /* 0xC4-0xC7 */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xC5, 0xA4, 0xC6, /* 0xC8-0xCB */ -- 0xA4, 0xC7, 0xA4, 0xC8, 0xA4, 0xC9, 0xA4, 0xCA, /* 0xCC-0xCF */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xCB, 0xA4, 0xCC, /* 0xD0-0xD3 */ -- 0xA4, 0xCD, 0xA4, 0xCE, 0xA4, 0xCF, 0xA4, 0xD0, /* 0xD4-0xD7 */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xD1, 0xA4, 0xD2, /* 0xD8-0xDB */ -- 0xA4, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xAC-0xAF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB4-0xB7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD4-0xD7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ - 0xA1, 0xCB, 0xA1, 0xCC, 0xA1, 0xFE, 0xA3, 0xFE, /* 0xE0-0xE3 */ - 0x00, 0x00, 0xA1, 0xCD, 0xA3, 0xDC, 0x00, 0x00, /* 0xE4-0xE7 */ - }; - - static unsigned char *page_uni2charset[256] = { -- NULL, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, -+ u2c_00, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, -+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- NULL, u2c_11, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - u2c_20, u2c_21, u2c_22, u2c_23, u2c_24, u2c_25, u2c_26, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -@@ -13780,11 +13755,12 @@ - u2c_C0, u2c_C1, u2c_C2, u2c_C3, u2c_C4, u2c_C5, u2c_C6, u2c_C7, - u2c_C8, u2c_C9, u2c_CA, u2c_CB, u2c_CC, u2c_CD, u2c_CE, u2c_CF, - u2c_D0, u2c_D1, u2c_D2, u2c_D3, u2c_D4, u2c_D5, u2c_D6, u2c_D7, -- NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, NULL, u2c_FF, }; -+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -+ NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, NULL, u2c_FF, -+}; - - static unsigned char charset2lower[256] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */ -@@ -13870,24 +13846,26 @@ - return -ENAMETOOLONG; - - -- uni2charset = page_uni2charset[ch]; -- if (uni2charset) { -- if (boundlen <= 1) -- return -ENAMETOOLONG; -- out[0] = uni2charset[cl*2]; -- out[1] = uni2charset[cl*2+1]; -- if (out[0] == 0x00 && out[1] == 0x00) -+ if (ch==0 && cl<0x80) { -+ out[0] = cl; -+ n = 1; -+ } else { -+ uni2charset = page_uni2charset[ch]; -+ if (uni2charset) { -+ if (boundlen <= 1) -+ return -ENAMETOOLONG; -+ out[0] = uni2charset[cl*2]; -+ out[1] = uni2charset[cl*2+1]; -+ if (out[0] == 0x00 && out[1] == 0x00) -+ return -EINVAL; -+ n = 2; -+ } -+ else - return -EINVAL; -- n = 2; -- } else if (ch==0 && cl) { -- out[0] = cl; -- n = 1; -- } -- else -- return -EINVAL; - - return n; --} -+ } -+} - - static int char2uni(const unsigned char *rawstring, int boundlen, - wchar_t *uni) -@@ -13908,7 +13886,7 @@ - cl = rawstring[1]; - - charset2uni = page_charset2uni[ch]; -- if (charset2uni && cl) { -+ if (charset2uni && ((rawstring[1]>=0x41 && rawstring[1]<=0x5A) || (rawstring[1]>=0x61 && rawstring[1]<=0x7A) || (rawstring[1]>=0x81 && rawstring[1]<=0xFE)) && cl) { - *uni = charset2uni[cl]; - if (*uni == 0x0000) - return -EINVAL; -@@ -13943,20 +13921,4 @@ - module_exit(exit_nls_cp949) - MODULE_LICENSE("Dual BSD/GPL"); - --/* -- * Overrides for Emacs so that we follow Linus's tabbing style. -- * Emacs will notice this stuff at the end of the file and automatically -- * adjust the settings for this buffer only. This must remain at the end -- * of the file. -- * ----------------------------------------------------------------------------- -- * Local variables: -- * c-indent-level: 8 -- * c-brace-imaginary-offset: 0 -- * c-brace-offset: -8 -- * c-argdecl-indent: 8 -- * c-label-offset: -8 -- * c-continued-statement-offset: 8 -- * c-continued-brace-offset: 0 -- * End: -- */ -+ ---- R29/fs/nls/nls_cp950.c 2004-03-24 19:56:03.000000000 +0000 -+++ R63/fs/nls/nls_cp950.c 2005-08-09 05:43:19.000000000 +0100 -@@ -3,8 +3,10 @@ - * - * Charset cp950 translation tables. - * This translation table was generated automatically, the -- * original table can be download from the Microsoft website. -- * (http://www.microsoft.com/typography/unicode/unicodecp.htm) -+ * original table can be found at the Microsoft website. -+ * (http://www.microsoft.com/globaldev/reference/dbcs/950.htm) -+ * download CP950.TXT from MIT Edu website -+ * (http://web.mit.edu/afs/dev.mit.edu/source/src-current/third/libiconv/tests/CP950.TXT) - */ - - #include <linux/module.h> -@@ -23,29 +25,29 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x3000,0xFF0C,0x3001,0x3002,0xFF0E,0x2027,0xFF1B,0xFF1A,/* 0x40-0x47 */ -- 0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFF64,0xFE52,/* 0x48-0x4F */ -+ 0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFE51,0xFE52,/* 0x48-0x4F */ - 0x00B7,0xFE54,0xFE55,0xFE56,0xFE57,0xFF5C,0x2013,0xFE31,/* 0x50-0x57 */ - 0x2014,0xFE33,0x2574,0xFE34,0xFE4F,0xFF08,0xFF09,0xFE35,/* 0x58-0x5F */ -- 0xFE36,0xFF5B,0xFF5D,0xFE37,0xFE38,0xFF3B,0xFF3D,0xFE39,/* 0x60-0x67 */ -+ 0xFE36,0xFF5B,0xFF5D,0xFE37,0xFE38,0x3014,0x3015,0xFE39,/* 0x60-0x67 */ - 0xFE3A,0x3010,0x3011,0xFE3B,0xFE3C,0x300A,0x300B,0xFE3D,/* 0x68-0x6F */ -- 0xFE3E,0x3008,0x3009,0xFF3E,0xFE40,0x300C,0x300D,0xFE41,/* 0x70-0x77 */ -+ 0xFE3E,0x3008,0x3009,0xFE3F,0xFE40,0x300C,0x300D,0xFE41,/* 0x70-0x77 */ - 0xFE42,0x300E,0x300F,0xFE43,0xFE44,0xFE59,0xFE5A,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0xFE5B,0xFE5C,0xFE5D,0xFE5E,0xFF40,0xFF07,0x201C,/* 0xA0-0xA7 */ -- 0xFF02,0x301D,0x301E,0x2035,0x2032,0xFF03,0xFF06,0xFF0A,/* 0xA8-0xAF */ -+ 0x0000,0xFE5B,0xFE5C,0xFE5D,0xFE5E,0x2018,0x2019,0x201C,/* 0xA0-0xA7 */ -+ 0x201D,0x301D,0x301E,0x2035,0x2032,0xFF03,0xFF06,0xFF0A,/* 0xA8-0xAF */ - 0x203B,0x00A7,0x3003,0x25CB,0x25CF,0x25B3,0x25B2,0x25CE,/* 0xB0-0xB7 */ - 0x2606,0x2605,0x25C7,0x25C6,0x25A1,0x25A0,0x25BD,0x25BC,/* 0xB8-0xBF */ -- 0x32A3,0x2105,0x0305,0xFFE3,0xFF3F,0x02CD,0xFE49,0xFE4A,/* 0xC0-0xC7 */ -+ 0x32A3,0x2105,0x00AF,0xFFE3,0xFF3F,0x02CD,0xFE49,0xFE4A,/* 0xC0-0xC7 */ - 0xFE4D,0xFE4E,0xFE4B,0xFE4C,0xFE5F,0xFE60,0xFE61,0xFF0B,/* 0xC8-0xCF */ - 0xFF0D,0x00D7,0x00F7,0x00B1,0x221A,0xFF1C,0xFF1E,0xFF1D,/* 0xD0-0xD7 */ -- 0x2266,0x2267,0x2260,0x221E,0x2252,0x2263,0xFE62,0xFE63,/* 0xD8-0xDF */ -+ 0x2266,0x2267,0x2260,0x221E,0x2252,0x2261,0xFE62,0xFE63,/* 0xD8-0xDF */ - 0xFE64,0xFE65,0xFE66,0xFF5E,0x2229,0x222A,0x22A5,0x2220,/* 0xE0-0xE7 */ - 0x221F,0x22BF,0x33D2,0x33D1,0x222B,0x222E,0x2235,0x2234,/* 0xE8-0xEF */ -- 0x2640,0x2642,0x2641,0x2609,0x2191,0x2193,0x2190,0x2192,/* 0xF0-0xF7 */ -+ 0x2640,0x2642,0x2295,0x2299,0x2191,0x2193,0x2190,0x2192,/* 0xF0-0xF7 */ - 0x2196,0x2197,0x2199,0x2198,0x2225,0x2223,0xFF0F,0x0000,/* 0xF8-0xFF */ - }; - -@@ -61,7 +63,7 @@ - 0xFF3C,0x2215,0xFE68,0xFF04,0xFFE5,0x3012,0xFFE0,0xFFE1,/* 0x40-0x47 */ - 0xFF05,0xFF20,0x2103,0x2109,0xFE69,0xFE6A,0xFE6B,0x33D5,/* 0x48-0x4F */ - 0x339C,0x339D,0x339E,0x33CE,0x33A1,0x338E,0x338F,0x33C4,/* 0x50-0x57 */ -- 0x2218,0x5159,0x515B,0x515E,0x515D,0x5161,0x5163,0x55E7,/* 0x58-0x5F */ -+ 0x00B0,0x5159,0x515B,0x515E,0x515D,0x5161,0x5163,0x55E7,/* 0x58-0x5F */ - 0x74E9,0x7CCE,0x2581,0x2582,0x2583,0x2584,0x2585,0x2586,/* 0x60-0x67 */ - 0x2587,0x2588,0x258F,0x258E,0x258D,0x258C,0x258B,0x258A,/* 0x68-0x6F */ - 0x2589,0x253C,0x2534,0x252C,0x2524,0x251C,0x2594,0x2500,/* 0x70-0x77 */ -@@ -71,12 +73,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x256E,0x2570,0x256F,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ -+ 0x0000,0x256E,0x2570,0x256F,0x2550,0x255E,0x256A,0x2561,/* 0xA0-0xA7 */ - 0x25E2,0x25E3,0x25E5,0x25E4,0x2571,0x2572,0x2573,0xFF10,/* 0xA8-0xAF */ - 0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17,0xFF18,/* 0xB0-0xB7 */ - 0xFF19,0x2160,0x2161,0x2162,0x2163,0x2164,0x2165,0x2166,/* 0xB8-0xBF */ - 0x2167,0x2168,0x2169,0x3021,0x3022,0x3023,0x3024,0x3025,/* 0xC0-0xC7 */ -- 0x3026,0x3027,0x3028,0x3029,0x0000,0x5344,0x0000,0xFF21,/* 0xC8-0xCF */ -+ 0x3026,0x3027,0x3028,0x3029,0x5341,0x5344,0x5345,0xFF21,/* 0xC8-0xCF */ - 0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27,0xFF28,0xFF29,/* 0xD0-0xD7 */ - 0xFF2A,0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,0xFF30,0xFF31,/* 0xD8-0xDF */ - 0xFF32,0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,0xFF38,0xFF39,/* 0xE0-0xE7 */ -@@ -110,15 +112,7 @@ - 0x0000,0x3110,0x3111,0x3112,0x3113,0x3114,0x3115,0x3116,/* 0xA0-0xA7 */ - 0x3117,0x3118,0x3119,0x311A,0x311B,0x311C,0x311D,0x311E,/* 0xA8-0xAF */ - 0x311F,0x3120,0x3121,0x3122,0x3123,0x3124,0x3125,0x3126,/* 0xB0-0xB7 */ -- 0x3127,0x3128,0x3129,0x2024,0x02C9,0x02CA,0x02C7,0x02CB,/* 0xB8-0xBF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xC0-0xC7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xC8-0xCF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xD0-0xD7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xD8-0xDF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xE0-0xE7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xE8-0xEF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xF0-0xF7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xF8-0xFF */ -+ 0x3127,0x3128,0x3129,0x02D9,0x02C9,0x02CA,0x02C7,0x02CB,/* 0xB8-0xBF */ - }; - - static wchar_t c2u_A4[256] = { -@@ -130,12 +124,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x4E00,0x4E59,0x4E01,0x4E03,0x4E43,0x4E5D,0xF9BA,0x4E8C,/* 0x40-0x47 */ -- 0x4EBA,0x513F,0x5165,0x516B,0x51E0,0x5200,0x5201,0xF98A,/* 0x48-0x4F */ -+ 0x4E00,0x4E59,0x4E01,0x4E03,0x4E43,0x4E5D,0x4E86,0x4E8C,/* 0x40-0x47 */ -+ 0x4EBA,0x513F,0x5165,0x516B,0x51E0,0x5200,0x5201,0x529B,/* 0x48-0x4F */ - 0x5315,0x5341,0x535C,0x53C8,0x4E09,0x4E0B,0x4E08,0x4E0A,/* 0x50-0x57 */ - 0x4E2B,0x4E38,0x51E1,0x4E45,0x4E48,0x4E5F,0x4E5E,0x4E8E,/* 0x58-0x5F */ - 0x4EA1,0x5140,0x5203,0x52FA,0x5343,0x53C9,0x53E3,0x571F,/* 0x60-0x67 */ -- 0x58EB,0x5915,0x5927,0xF981,0x5B50,0x5B51,0x5B53,0x5BF8,/* 0x68-0x6F */ -+ 0x58EB,0x5915,0x5927,0x5973,0x5B50,0x5B51,0x5B53,0x5BF8,/* 0x68-0x6F */ - 0x5C0F,0x5C22,0x5C38,0x5C71,0x5DDD,0x5DE5,0x5DF1,0x5DF2,/* 0x70-0x77 */ - 0x5DF3,0x5DFE,0x5E72,0x5EFE,0x5F0B,0x5F13,0x624D,0x0000,/* 0x78-0x7F */ - -@@ -143,11 +137,11 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x4E11,0x4E10,0xF967,0x4E2D,0x4E30,0xF95E,0x4E4B,/* 0xA0-0xA7 */ -+ 0x0000,0x4E11,0x4E10,0x4E0D,0x4E2D,0x4E30,0x4E39,0x4E4B,/* 0xA0-0xA7 */ - 0x5C39,0x4E88,0x4E91,0x4E95,0x4E92,0x4E94,0x4EA2,0x4EC1,/* 0xA8-0xAF */ -- 0xF9FD,0x4EC3,0x4EC6,0x4EC7,0x4ECD,0x4ECA,0x4ECB,0x4EC4,/* 0xB0-0xB7 */ -- 0x5143,0x5141,0x5167,0xF9D1,0x516E,0x516C,0x5197,0x51F6,/* 0xB8-0xBF */ -- 0x5206,0xFA00,0x5208,0x52FB,0x52FE,0x52FF,0x5316,0x5339,/* 0xC0-0xC7 */ -+ 0x4EC0,0x4EC3,0x4EC6,0x4EC7,0x4ECD,0x4ECA,0x4ECB,0x4EC4,/* 0xB0-0xB7 */ -+ 0x5143,0x5141,0x5167,0x516D,0x516E,0x516C,0x5197,0x51F6,/* 0xB8-0xBF */ -+ 0x5206,0x5207,0x5208,0x52FB,0x52FE,0x52FF,0x5316,0x5339,/* 0xC0-0xC7 */ - 0x5348,0x5347,0x5345,0x535E,0x5384,0x53CB,0x53CA,0x53CD,/* 0xC8-0xCF */ - 0x58EC,0x5929,0x592B,0x592A,0x592D,0x5B54,0x5C11,0x5C24,/* 0xD0-0xD7 */ - 0x5C3A,0x5C6F,0x5DF4,0x5E7B,0x5EFF,0x5F14,0x5F15,0x5FC3,/* 0xD8-0xDF */ -@@ -167,13 +161,13 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x4E16,0x4E15,0x4E14,0x4E18,0x4E3B,0x4E4D,0x4E4F,0x4E4E,/* 0x40-0x47 */ -- 0x4EE5,0x4ED8,0x4ED4,0x4ED5,0x4ED6,0x4ED7,0x4EE3,0xF9A8,/* 0x48-0x4F */ -+ 0x4EE5,0x4ED8,0x4ED4,0x4ED5,0x4ED6,0x4ED7,0x4EE3,0x4EE4,/* 0x48-0x4F */ - 0x4ED9,0x4EDE,0x5145,0x5144,0x5189,0x518A,0x51AC,0x51F9,/* 0x50-0x57 */ -- 0x51FA,0x51F8,0x520A,0x52A0,0x529F,0x5305,0x5306,0xF963,/* 0x58-0x5F */ -+ 0x51FA,0x51F8,0x520A,0x52A0,0x529F,0x5305,0x5306,0x5317,/* 0x58-0x5F */ - 0x531D,0x4EDF,0x534A,0x5349,0x5361,0x5360,0x536F,0x536E,/* 0x60-0x67 */ - 0x53BB,0x53EF,0x53E4,0x53F3,0x53EC,0x53EE,0x53E9,0x53E8,/* 0x68-0x6F */ - 0x53FC,0x53F8,0x53F5,0x53EB,0x53E6,0x53EA,0x53F2,0x53F1,/* 0x70-0x77 */ -- 0x53F0,0xF906,0x53ED,0x53FB,0x56DB,0x56DA,0x5916,0x0000,/* 0x78-0x7F */ -+ 0x53F0,0x53E5,0x53ED,0x53FB,0x56DB,0x56DA,0x5916,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ -@@ -186,7 +180,7 @@ - 0x6BCD,0x6C11,0x6C10,0x6C38,0x6C41,0x6C40,0x6C3E,0x72AF,/* 0xC0-0xC7 */ - 0x7384,0x7389,0x74DC,0x74E6,0x7518,0x751F,0x7528,0x7529,/* 0xC8-0xCF */ - 0x7530,0x7531,0x7532,0x7533,0x758B,0x767D,0x76AE,0x76BF,/* 0xD0-0xD7 */ -- 0x76EE,0x77DB,0x77E2,0x77F3,0x793A,0x79BE,0x7A74,0xF9F7,/* 0xD8-0xDF */ -+ 0x76EE,0x77DB,0x77E2,0x77F3,0x793A,0x79BE,0x7A74,0x7ACB,/* 0xD8-0xDF */ - 0x4E1E,0x4E1F,0x4E52,0x4E53,0x4E69,0x4E99,0x4EA4,0x4EA6,/* 0xE0-0xE7 */ - 0x4EA5,0x4EFF,0x4F09,0x4F19,0x4F0A,0x4F15,0x4F0D,0x4F10,/* 0xE8-0xEF */ - 0x4F11,0x4F0F,0x4EF2,0x4EF6,0x4EFB,0x4EF0,0x4EF3,0x4EFD,/* 0xF0-0xF7 */ -@@ -202,14 +196,14 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x5171,0x518D,0x51B0,0xF99C,0x5211,0x5212,0x520E,0x5216,/* 0x40-0x47 */ -- 0xF99D,0x5308,0x5321,0x5320,0x5370,0x5371,0x5409,0xF9DE,/* 0x48-0x4F */ -+ 0x5171,0x518D,0x51B0,0x5217,0x5211,0x5212,0x520E,0x5216,/* 0x40-0x47 */ -+ 0x52A3,0x5308,0x5321,0x5320,0x5370,0x5371,0x5409,0x540F,/* 0x48-0x4F */ - 0x540C,0x540A,0x5410,0x5401,0x540B,0x5404,0x5411,0x540D,/* 0x50-0x57 */ - 0x5408,0x5403,0x540E,0x5406,0x5412,0x56E0,0x56DE,0x56DD,/* 0x58-0x5F */ - 0x5733,0x5730,0x5728,0x572D,0x572C,0x572F,0x5729,0x5919,/* 0x60-0x67 */ - 0x591A,0x5937,0x5938,0x5984,0x5978,0x5983,0x597D,0x5979,/* 0x68-0x6F */ -- 0x5982,0x5981,0x5B57,0x5B58,0x5B87,0x5B88,0xFA04,0x5B89,/* 0x70-0x77 */ -- 0x5BFA,0x5C16,0x5C79,0x5DDE,0x5E06,0x5E76,0xF98E,0x0000,/* 0x78-0x7F */ -+ 0x5982,0x5981,0x5B57,0x5B58,0x5B87,0x5B88,0x5B85,0x5B89,/* 0x70-0x77 */ -+ 0x5BFA,0x5C16,0x5C79,0x5DDE,0x5E06,0x5E76,0x5E74,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ -@@ -221,10 +215,10 @@ - 0x6B21,0x6B64,0x6B7B,0x6C16,0x6C5D,0x6C57,0x6C59,0x6C5F,/* 0xB8-0xBF */ - 0x6C60,0x6C50,0x6C55,0x6C61,0x6C5B,0x6C4D,0x6C4E,0x7070,/* 0xC0-0xC7 */ - 0x725F,0x725D,0x767E,0x7AF9,0x7C73,0x7CF8,0x7F36,0x7F8A,/* 0xC8-0xCF */ -- 0xFA1E,0xF934,0x8003,0x800C,0x8012,0x8033,0x807F,0x8089,/* 0xD0-0xD7 */ -- 0xF953,0x808C,0x81E3,0x81EA,0x81F3,0x81FC,0x820C,0x821B,/* 0xD8-0xDF */ -- 0x821F,0x826E,0x8272,0x827E,0x866B,0x8840,0xFA08,0x8863,/* 0xE0-0xE7 */ -- 0x897F,0x9621,0xF905,0x4EA8,0x4F4D,0x4F4F,0x4F47,0x4F57,/* 0xE8-0xEF */ -+ 0x7FBD,0x8001,0x8003,0x800C,0x8012,0x8033,0x807F,0x8089,/* 0xD0-0xD7 */ -+ 0x808B,0x808C,0x81E3,0x81EA,0x81F3,0x81FC,0x820C,0x821B,/* 0xD8-0xDF */ -+ 0x821F,0x826E,0x8272,0x827E,0x866B,0x8840,0x884C,0x8863,/* 0xE0-0xE7 */ -+ 0x897F,0x9621,0x4E32,0x4EA8,0x4F4D,0x4F4F,0x4F47,0x4F57,/* 0xE8-0xEF */ - 0x4F5E,0x4F34,0x4F5B,0x4F55,0x4F30,0x4F50,0x4F51,0x4F3D,/* 0xF0-0xF7 */ - 0x4F3A,0x4F38,0x4F43,0x4F54,0x4F3C,0x4F46,0x4F63,0x0000,/* 0xF8-0xFF */ - }; -@@ -239,10 +233,10 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x4F5C,0x4F60,0x4F2F,0x4F4E,0x4F36,0x4F59,0x4F5D,0x4F48,/* 0x40-0x47 */ -- 0x4F5A,0x514C,0x514B,0x514D,0x5175,0x51B6,0xF92E,0x5225,/* 0x48-0x4F */ -- 0x5224,0xF9DD,0x522A,0x5228,0x52AB,0x52A9,0x52AA,0x52AC,/* 0x50-0x57 */ -- 0x5323,0x5373,0xF91C,0xF9ED,0x542D,0x541E,0x543E,0x5426,/* 0x58-0x5F */ -- 0x544E,0x5427,0x5446,0x5443,0x5433,0x5448,0xF980,0x541B,/* 0x60-0x67 */ -+ 0x4F5A,0x514C,0x514B,0x514D,0x5175,0x51B6,0x51B7,0x5225,/* 0x48-0x4F */ -+ 0x5224,0x5229,0x522A,0x5228,0x52AB,0x52A9,0x52AA,0x52AC,/* 0x50-0x57 */ -+ 0x5323,0x5373,0x5375,0x541D,0x542D,0x541E,0x543E,0x5426,/* 0x58-0x5F */ -+ 0x544E,0x5427,0x5446,0x5443,0x5433,0x5448,0x5442,0x541B,/* 0x60-0x67 */ - 0x5429,0x544A,0x5439,0x543B,0x5438,0x542E,0x5435,0x5436,/* 0x68-0x6F */ - 0x5420,0x543C,0x5440,0x5431,0x542B,0x541F,0x542C,0x56EA,/* 0x70-0x77 */ - 0x56F0,0x56E4,0x56EB,0x574A,0x5751,0x5740,0x574D,0x0000,/* 0x78-0x7F */ -@@ -254,14 +248,14 @@ - 0x0000,0x5747,0x574E,0x573E,0x5750,0x574F,0x573B,0x58EF,/* 0xA0-0xA7 */ - 0x593E,0x599D,0x5992,0x59A8,0x599E,0x59A3,0x5999,0x5996,/* 0xA8-0xAF */ - 0x598D,0x59A4,0x5993,0x598A,0x59A5,0x5B5D,0x5B5C,0x5B5A,/* 0xB0-0xB7 */ -- 0x5B5B,0x5B8C,0x5B8B,0x5B8F,0x5C2C,0x5C40,0x5C41,0xF9BD,/* 0xB8-0xBF */ -+ 0x5B5B,0x5B8C,0x5B8B,0x5B8F,0x5C2C,0x5C40,0x5C41,0x5C3F,/* 0xB8-0xBF */ - 0x5C3E,0x5C90,0x5C91,0x5C94,0x5C8C,0x5DEB,0x5E0C,0x5E8F,/* 0xC0-0xC7 */ -- 0x5E87,0x5E8A,0x5EF7,0xF943,0x5F1F,0x5F64,0x5F62,0x5F77,/* 0xC8-0xCF */ -+ 0x5E87,0x5E8A,0x5EF7,0x5F04,0x5F1F,0x5F64,0x5F62,0x5F77,/* 0xC8-0xCF */ - 0x5F79,0x5FD8,0x5FCC,0x5FD7,0x5FCD,0x5FF1,0x5FEB,0x5FF8,/* 0xD0-0xD7 */ - 0x5FEA,0x6212,0x6211,0x6284,0x6297,0x6296,0x6280,0x6276,/* 0xD8-0xDF */ - 0x6289,0x626D,0x628A,0x627C,0x627E,0x6279,0x6273,0x6292,/* 0xE0-0xE7 */ - 0x626F,0x6298,0x626E,0x6295,0x6293,0x6291,0x6286,0x6539,/* 0xE8-0xEF */ -- 0x653B,0x6538,0x65F1,0xF901,0x675F,0xF9E1,0x674F,0x6750,/* 0xF0-0xF7 */ -+ 0x653B,0x6538,0x65F1,0x66F4,0x675F,0x674E,0x674F,0x6750,/* 0xF0-0xF7 */ - 0x6751,0x675C,0x6756,0x675E,0x6749,0x6746,0x6760,0x0000,/* 0xF8-0xFF */ - }; - -@@ -275,28 +269,28 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x6753,0x6757,0x6B65,0x6BCF,0x6C42,0x6C5E,0x6C99,0x6C81,/* 0x40-0x47 */ -- 0xF972,0x6C89,0x6C85,0x6C9B,0x6C6A,0x6C7A,0x6C90,0x6C70,/* 0x48-0x4F */ -+ 0x6C88,0x6C89,0x6C85,0x6C9B,0x6C6A,0x6C7A,0x6C90,0x6C70,/* 0x48-0x4F */ - 0x6C8C,0x6C68,0x6C96,0x6C92,0x6C7D,0x6C83,0x6C72,0x6C7E,/* 0x50-0x57 */ - 0x6C74,0x6C86,0x6C76,0x6C8D,0x6C94,0x6C98,0x6C82,0x7076,/* 0x58-0x5F */ -- 0x707C,0x707D,0x7078,0xF946,0x7261,0x7260,0x72C4,0x72C2,/* 0x60-0x67 */ -+ 0x707C,0x707D,0x7078,0x7262,0x7261,0x7260,0x72C4,0x72C2,/* 0x60-0x67 */ - 0x7396,0x752C,0x752B,0x7537,0x7538,0x7682,0x76EF,0x77E3,/* 0x68-0x6F */ - 0x79C1,0x79C0,0x79BF,0x7A76,0x7CFB,0x7F55,0x8096,0x8093,/* 0x70-0x77 */ -- 0x809D,0x8098,0x809B,0x809A,0x80B2,0xF97C,0x8292,0x0000,/* 0x78-0x7F */ -+ 0x809D,0x8098,0x809B,0x809A,0x80B2,0x826F,0x8292,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x828B,0x828D,0xFA0A,0x89D2,0x8A00,0x8C37,0x8C46,/* 0xA0-0xA7 */ -- 0x8C55,0x8C9D,0x8D64,0x8D70,0x8DB3,0x8EAB,0xF902,0x8F9B,/* 0xA8-0xAF */ -- 0xF971,0x8FC2,0x8FC6,0x8FC5,0x8FC4,0x5DE1,0x9091,0x90A2,/* 0xB0-0xB7 */ -- 0x90AA,0x90A6,0x90A3,0x9149,0x91C6,0xF9E9,0x9632,0xF9C6,/* 0xB8-0xBF */ -+ 0x0000,0x828B,0x828D,0x898B,0x89D2,0x8A00,0x8C37,0x8C46,/* 0xA0-0xA7 */ -+ 0x8C55,0x8C9D,0x8D64,0x8D70,0x8DB3,0x8EAB,0x8ECA,0x8F9B,/* 0xA8-0xAF */ -+ 0x8FB0,0x8FC2,0x8FC6,0x8FC5,0x8FC4,0x5DE1,0x9091,0x90A2,/* 0xB0-0xB7 */ -+ 0x90AA,0x90A6,0x90A3,0x9149,0x91C6,0x91CC,0x9632,0x962E,/* 0xB8-0xBF */ - 0x9631,0x962A,0x962C,0x4E26,0x4E56,0x4E73,0x4E8B,0x4E9B,/* 0xC0-0xC7 */ - 0x4E9E,0x4EAB,0x4EAC,0x4F6F,0x4F9D,0x4F8D,0x4F73,0x4F7F,/* 0xC8-0xCF */ -- 0x4F6C,0x4F9B,0xF9B5,0xF92D,0x4F83,0x4F70,0x4F75,0x4F88,/* 0xD0-0xD7 */ -+ 0x4F6C,0x4F9B,0x4F8B,0x4F86,0x4F83,0x4F70,0x4F75,0x4F88,/* 0xD0-0xD7 */ - 0x4F69,0x4F7B,0x4F96,0x4F7E,0x4F8F,0x4F91,0x4F7A,0x5154,/* 0xD8-0xDF */ -- 0x5152,0x5155,0xF978,0x5177,0x5176,0x5178,0x51BD,0x51FD,/* 0xE0-0xE7 */ -- 0x523B,0x5238,0x5237,0xF9FF,0x5230,0x522E,0x5236,0x5241,/* 0xE8-0xEF */ -+ 0x5152,0x5155,0x5169,0x5177,0x5176,0x5178,0x51BD,0x51FD,/* 0xE0-0xE7 */ -+ 0x523B,0x5238,0x5237,0x523A,0x5230,0x522E,0x5236,0x5241,/* 0xE8-0xEF */ - 0x52BE,0x52BB,0x5352,0x5354,0x5353,0x5351,0x5366,0x5377,/* 0xF0-0xF7 */ - 0x5378,0x5379,0x53D6,0x53D4,0x53D7,0x5473,0x5475,0x0000,/* 0xF8-0xFF */ - }; -@@ -314,7 +308,7 @@ - 0x5486,0x547C,0x5490,0x5471,0x5476,0x548C,0x549A,0x5462,/* 0x48-0x4F */ - 0x5468,0x548B,0x547D,0x548E,0x56FA,0x5783,0x5777,0x576A,/* 0x50-0x57 */ - 0x5769,0x5761,0x5766,0x5764,0x577C,0x591C,0x5949,0x5947,/* 0x58-0x5F */ -- 0xF90C,0x5944,0x5954,0x59BE,0x59BB,0x59D4,0x59B9,0x59AE,/* 0x60-0x67 */ -+ 0x5948,0x5944,0x5954,0x59BE,0x59BB,0x59D4,0x59B9,0x59AE,/* 0x60-0x67 */ - 0x59D1,0x59C6,0x59D0,0x59CD,0x59CB,0x59D3,0x59CA,0x59AF,/* 0x68-0x6F */ - 0x59B3,0x59D2,0x59C5,0x5B5F,0x5B64,0x5B63,0x5B97,0x5B9A,/* 0x70-0x77 */ - 0x5B98,0x5B9C,0x5B99,0x5B9B,0x5C1A,0x5C48,0x5C45,0x0000,/* 0x78-0x7F */ -@@ -327,13 +321,13 @@ - 0x5CB3,0x5E18,0x5E1A,0x5E16,0x5E15,0x5E1B,0x5E11,0x5E78,/* 0xA8-0xAF */ - 0x5E9A,0x5E97,0x5E9C,0x5E95,0x5E96,0x5EF6,0x5F26,0x5F27,/* 0xB0-0xB7 */ - 0x5F29,0x5F80,0x5F81,0x5F7F,0x5F7C,0x5FDD,0x5FE0,0x5FFD,/* 0xB8-0xBF */ -- 0xF9A3,0x5FFF,0x600F,0x6014,0x602F,0x6035,0x6016,0x602A,/* 0xC0-0xC7 */ -+ 0x5FF5,0x5FFF,0x600F,0x6014,0x602F,0x6035,0x6016,0x602A,/* 0xC0-0xC7 */ - 0x6015,0x6021,0x6027,0x6029,0x602B,0x601B,0x6216,0x6215,/* 0xC8-0xCF */ -- 0x623F,0x623E,0x6240,0x627F,0xF925,0x62CC,0x62C4,0x62BF,/* 0xD0-0xD7 */ -- 0x62C2,0x62B9,0x62D2,0x62DB,0x62AB,0xFA02,0x62D4,0x62CB,/* 0xD8-0xDF */ -+ 0x623F,0x623E,0x6240,0x627F,0x62C9,0x62CC,0x62C4,0x62BF,/* 0xD0-0xD7 */ -+ 0x62C2,0x62B9,0x62D2,0x62DB,0x62AB,0x62D3,0x62D4,0x62CB,/* 0xD8-0xDF */ - 0x62C8,0x62A8,0x62BD,0x62BC,0x62D0,0x62D9,0x62C7,0x62CD,/* 0xE0-0xE7 */ - 0x62B5,0x62DA,0x62B1,0x62D8,0x62D6,0x62D7,0x62C6,0x62AC,/* 0xE8-0xEF */ -- 0x62CE,0x653E,0x65A7,0x65BC,0x65FA,0x6614,0xF9E0,0x660C,/* 0xF0-0xF7 */ -+ 0x62CE,0x653E,0x65A7,0x65BC,0x65FA,0x6614,0x6613,0x660C,/* 0xF0-0xF7 */ - 0x6606,0x6602,0x660E,0x6600,0x660F,0x6615,0x660A,0x0000,/* 0xF8-0xFF */ - }; - -@@ -347,10 +341,10 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x6607,0x670D,0x670B,0x676D,0x678B,0x6795,0x6771,0x679C,/* 0x40-0x47 */ -- 0x6773,0x6777,0x6787,0x679D,0xF9F4,0x676F,0x6770,0x677F,/* 0x48-0x4F */ -+ 0x6773,0x6777,0x6787,0x679D,0x6797,0x676F,0x6770,0x677F,/* 0x48-0x4F */ - 0x6789,0x677E,0x6790,0x6775,0x679A,0x6793,0x677C,0x676A,/* 0x50-0x57 */ - 0x6772,0x6B23,0x6B66,0x6B67,0x6B7F,0x6C13,0x6C1B,0x6CE3,/* 0x58-0x5F */ -- 0x6CE8,0x6CF3,0x6CB1,0xF968,0xF9E3,0x6CB3,0x6CBD,0x6CBE,/* 0x60-0x67 */ -+ 0x6CE8,0x6CF3,0x6CB1,0x6CCC,0x6CE5,0x6CB3,0x6CBD,0x6CBE,/* 0x60-0x67 */ - 0x6CBC,0x6CE2,0x6CAB,0x6CD5,0x6CD3,0x6CB8,0x6CC4,0x6CB9,/* 0x68-0x6F */ - 0x6CC1,0x6CAE,0x6CD7,0x6CC5,0x6CF1,0x6CBF,0x6CBB,0x6CE1,/* 0x70-0x77 */ - 0x6CDB,0x6CCA,0x6CAC,0x6CEF,0x6CDC,0x6CD6,0x6CE0,0x0000,/* 0x78-0x7F */ -@@ -359,8 +353,8 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x7095,0x708E,0x7092,0x708A,0xF9FB,0x722C,0x722D,/* 0xA0-0xA7 */ -- 0x7238,0x7248,0x7267,0x7269,0xF9FA,0x72CE,0x72D9,0x72D7,/* 0xA8-0xAF */ -+ 0x0000,0x7095,0x708E,0x7092,0x708A,0x7099,0x722C,0x722D,/* 0xA0-0xA7 */ -+ 0x7238,0x7248,0x7267,0x7269,0x72C0,0x72CE,0x72D9,0x72D7,/* 0xA8-0xAF */ - 0x72D0,0x73A9,0x73A8,0x739F,0x73AB,0x73A5,0x753D,0x759D,/* 0xB0-0xB7 */ - 0x7599,0x759A,0x7684,0x76C2,0x76F2,0x76F4,0x77E5,0x77FD,/* 0xB8-0xBF */ - 0x793E,0x7940,0x7941,0x79C9,0x79C8,0x7A7A,0x7A79,0x7AFA,/* 0xC0-0xC7 */ -@@ -369,7 +363,7 @@ - 0x81FE,0x820D,0x82B3,0x829D,0x8299,0x82AD,0x82BD,0x829F,/* 0xD8-0xDF */ - 0x82B9,0x82B1,0x82AC,0x82A5,0x82AF,0x82B8,0x82A3,0x82B0,/* 0xE0-0xE7 */ - 0x82BE,0x82B7,0x864E,0x8671,0x521D,0x8868,0x8ECB,0x8FCE,/* 0xE8-0xEF */ -- 0x8FD4,0x8FD1,0x90B5,0x90B8,0x90B1,0x90B6,0x91C7,0xF90A,/* 0xF0-0xF7 */ -+ 0x8FD4,0x8FD1,0x90B5,0x90B8,0x90B1,0x90B6,0x91C7,0x91D1,/* 0xF0-0xF7 */ - 0x9577,0x9580,0x961C,0x9640,0x963F,0x963B,0x9644,0x0000,/* 0xF8-0xFF */ - }; - -@@ -382,14 +376,14 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x9642,0x96B9,0x96E8,0x9752,0x975E,0x4E9F,0x4EAD,0xF977,/* 0x40-0x47 */ -- 0x4FE1,0x4FB5,0x4FAF,0xF965,0x4FE0,0x4FD1,0x4FCF,0x4FDD,/* 0x48-0x4F */ -+ 0x9642,0x96B9,0x96E8,0x9752,0x975E,0x4E9F,0x4EAD,0x4EAE,/* 0x40-0x47 */ -+ 0x4FE1,0x4FB5,0x4FAF,0x4FBF,0x4FE0,0x4FD1,0x4FCF,0x4FDD,/* 0x48-0x4F */ - 0x4FC3,0x4FB6,0x4FD8,0x4FDF,0x4FCA,0x4FD7,0x4FAE,0x4FD0,/* 0x50-0x57 */ - 0x4FC4,0x4FC2,0x4FDA,0x4FCE,0x4FDE,0x4FB7,0x5157,0x5192,/* 0x58-0x5F */ - 0x5191,0x51A0,0x524E,0x5243,0x524A,0x524D,0x524C,0x524B,/* 0x60-0x67 */ - 0x5247,0x52C7,0x52C9,0x52C3,0x52C1,0x530D,0x5357,0x537B,/* 0x68-0x6F */ - 0x539A,0x53DB,0x54AC,0x54C0,0x54A8,0x54CE,0x54C9,0x54B8,/* 0x70-0x77 */ -- 0x54A6,0x54B3,0x54C7,0x54C2,0xF99E,0x54AA,0x54C1,0x0000,/* 0x78-0x7F */ -+ 0x54A6,0x54B3,0x54C7,0x54C2,0x54BD,0x54AA,0x54C1,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ -@@ -397,13 +391,13 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x54C4,0x54C8,0x54AF,0x54AB,0x54B1,0x54BB,0x54A9,/* 0xA0-0xA7 */ - 0x54A7,0x54BF,0x56FF,0x5782,0x578B,0x57A0,0x57A3,0x57A2,/* 0xA8-0xAF */ -- 0x57CE,0x57AE,0x5793,0x5955,0xF909,0x594F,0x594E,0x5950,/* 0xB0-0xB7 */ -+ 0x57CE,0x57AE,0x5793,0x5955,0x5951,0x594F,0x594E,0x5950,/* 0xB0-0xB7 */ - 0x59DC,0x59D8,0x59FF,0x59E3,0x59E8,0x5A03,0x59E5,0x59EA,/* 0xB8-0xBF */ - 0x59DA,0x59E6,0x5A01,0x59FB,0x5B69,0x5BA3,0x5BA6,0x5BA4,/* 0xC0-0xC7 */ - 0x5BA2,0x5BA5,0x5C01,0x5C4E,0x5C4F,0x5C4D,0x5C4B,0x5CD9,/* 0xC8-0xCF */ -- 0x5CD2,0x5DF7,0x5E1D,0x5E25,0x5E1F,0x5E7D,0x5EA0,0xFA01,/* 0xD0-0xD7 */ -- 0x5EFA,0x5F08,0x5F2D,0x5F65,0x5F88,0x5F85,0x5F8A,0xF9D8,/* 0xD8-0xDF */ -- 0x5F87,0x5F8C,0x5F89,0xF960,0x601D,0x6020,0x6025,0x600E,/* 0xE0-0xE7 */ -+ 0x5CD2,0x5DF7,0x5E1D,0x5E25,0x5E1F,0x5E7D,0x5EA0,0x5EA6,/* 0xD0-0xD7 */ -+ 0x5EFA,0x5F08,0x5F2D,0x5F65,0x5F88,0x5F85,0x5F8A,0x5F8B,/* 0xD8-0xDF */ -+ 0x5F87,0x5F8C,0x5F89,0x6012,0x601D,0x6020,0x6025,0x600E,/* 0xE0-0xE7 */ - 0x6028,0x604D,0x6070,0x6068,0x6062,0x6046,0x6043,0x606C,/* 0xE8-0xEF */ - 0x606B,0x606A,0x6064,0x6241,0x62DC,0x6316,0x6309,0x62FC,/* 0xF0-0xF7 */ - 0x62ED,0x6301,0x62EE,0x62FD,0x6307,0x62F1,0x62F7,0x0000,/* 0xF8-0xFF */ -@@ -418,27 +412,27 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x62EF,0x62EC,0xF973,0x62F4,0x6311,0x6302,0x653F,0x6545,/* 0x40-0x47 */ -+ 0x62EF,0x62EC,0x62FE,0x62F4,0x6311,0x6302,0x653F,0x6545,/* 0x40-0x47 */ - 0x65AB,0x65BD,0x65E2,0x6625,0x662D,0x6620,0x6627,0x662F,/* 0x48-0x4F */ - 0x661F,0x6628,0x6631,0x6624,0x66F7,0x67FF,0x67D3,0x67F1,/* 0x50-0x57 */ - 0x67D4,0x67D0,0x67EC,0x67B6,0x67AF,0x67F5,0x67E9,0x67EF,/* 0x58-0x5F */ - 0x67C4,0x67D1,0x67B4,0x67DA,0x67E5,0x67B8,0x67CF,0x67DE,/* 0x60-0x67 */ -- 0xF9C9,0x67B0,0x67D9,0x67E2,0x67DD,0x67D2,0x6B6A,0x6B83,/* 0x68-0x6F */ -+ 0x67F3,0x67B0,0x67D9,0x67E2,0x67DD,0x67D2,0x6B6A,0x6B83,/* 0x68-0x6F */ - 0x6B86,0x6BB5,0x6BD2,0x6BD7,0x6C1F,0x6CC9,0x6D0B,0x6D32,/* 0x70-0x77 */ -- 0x6D2A,0xF9CA,0x6D25,0x6D0C,0x6D31,0xFA05,0x6D17,0x0000,/* 0x78-0x7F */ -+ 0x6D2A,0x6D41,0x6D25,0x6D0C,0x6D31,0x6D1E,0x6D17,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x6D3B,0x6D3D,0x6D3E,0x6D36,0xF915,0x6CF5,0x6D39,/* 0xA0-0xA7 */ -+ 0x0000,0x6D3B,0x6D3D,0x6D3E,0x6D36,0x6D1B,0x6CF5,0x6D39,/* 0xA0-0xA7 */ - 0x6D27,0x6D38,0x6D29,0x6D2E,0x6D35,0x6D0E,0x6D2B,0x70AB,/* 0xA8-0xAF */ - 0x70BA,0x70B3,0x70AC,0x70AF,0x70AD,0x70B8,0x70AE,0x70A4,/* 0xB0-0xB7 */ - 0x7230,0x7272,0x726F,0x7274,0x72E9,0x72E0,0x72E1,0x73B7,/* 0xB8-0xBF */ -- 0x73CA,0x73BB,0xF9AD,0x73CD,0x73C0,0x73B3,0x751A,0x752D,/* 0xC0-0xC7 */ -+ 0x73CA,0x73BB,0x73B2,0x73CD,0x73C0,0x73B3,0x751A,0x752D,/* 0xC0-0xC7 */ - 0x754F,0x754C,0x754E,0x754B,0x75AB,0x75A4,0x75A5,0x75A2,/* 0xC8-0xCF */ - 0x75A3,0x7678,0x7686,0x7687,0x7688,0x76C8,0x76C6,0x76C3,/* 0xD0-0xD7 */ -- 0x76C5,0xF96D,0x76F9,0x76F8,0x7709,0x770B,0x76FE,0x76FC,/* 0xD8-0xDF */ -+ 0x76C5,0x7701,0x76F9,0x76F8,0x7709,0x770B,0x76FE,0x76FC,/* 0xD8-0xDF */ - 0x7707,0x77DC,0x7802,0x7814,0x780C,0x780D,0x7946,0x7949,/* 0xE0-0xE7 */ - 0x7948,0x7947,0x79B9,0x79BA,0x79D1,0x79D2,0x79CB,0x7A7F,/* 0xE8-0xEF */ - 0x7A81,0x7AFF,0x7AFD,0x7C7D,0x7D02,0x7D05,0x7D00,0x7D09,/* 0xF0-0xF7 */ -@@ -457,7 +451,7 @@ - 0x8010,0x800D,0x8011,0x8036,0x80D6,0x80E5,0x80DA,0x80C3,/* 0x40-0x47 */ - 0x80C4,0x80CC,0x80E1,0x80DB,0x80CE,0x80DE,0x80E4,0x80DD,/* 0x48-0x4F */ - 0x81F4,0x8222,0x82E7,0x8303,0x8305,0x82E3,0x82DB,0x82E6,/* 0x50-0x57 */ -- 0x8304,0xF974,0x8302,0x8309,0x82D2,0x82D7,0x82F1,0x8301,/* 0x58-0x5F */ -+ 0x8304,0x82E5,0x8302,0x8309,0x82D2,0x82D7,0x82F1,0x8301,/* 0x58-0x5F */ - 0x82DC,0x82D4,0x82D1,0x82DE,0x82D3,0x82DF,0x82EF,0x8306,/* 0x60-0x67 */ - 0x8650,0x8679,0x867B,0x867A,0x884D,0x886B,0x8981,0x89D4,/* 0x68-0x6F */ - 0x8A08,0x8A02,0x8A03,0x8C9E,0x8CA0,0x8D74,0x8D73,0x8DB4,/* 0x70-0x77 */ -@@ -468,14 +462,14 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x8FED,0x8FEB,0x8FE4,0x8FE8,0x90CA,0x90CE,0x90C1,/* 0xA0-0xA7 */ -- 0x90C3,0x914B,0x914A,0x91CD,0x9582,0x9650,0xF951,0x964C,/* 0xA8-0xAF */ -- 0xFA09,0x9762,0x9769,0x97CB,0x97ED,0x97F3,0x9801,0x98A8,/* 0xB0-0xB7 */ -+ 0x90C3,0x914B,0x914A,0x91CD,0x9582,0x9650,0x964B,0x964C,/* 0xA8-0xAF */ -+ 0x964D,0x9762,0x9769,0x97CB,0x97ED,0x97F3,0x9801,0x98A8,/* 0xB0-0xB7 */ - 0x98DB,0x98DF,0x9996,0x9999,0x4E58,0x4EB3,0x500C,0x500D,/* 0xB8-0xBF */ - 0x5023,0x4FEF,0x5026,0x5025,0x4FF8,0x5029,0x5016,0x5006,/* 0xC0-0xC7 */ - 0x503C,0x501F,0x501A,0x5012,0x5011,0x4FFA,0x5000,0x5014,/* 0xC8-0xCF */ - 0x5028,0x4FF1,0x5021,0x500B,0x5019,0x5018,0x4FF3,0x4FEE,/* 0xD0-0xD7 */ -- 0x502D,0x502A,0x4FFE,0xF9D4,0x5009,0x517C,0x51A4,0x51A5,/* 0xD8-0xDF */ -- 0x51A2,0x51CD,0xF955,0x51C6,0x51CB,0x5256,0x525C,0x5254,/* 0xE0-0xE7 */ -+ 0x502D,0x502A,0x4FFE,0x502B,0x5009,0x517C,0x51A4,0x51A5,/* 0xD8-0xDF */ -+ 0x51A2,0x51CD,0x51CC,0x51C6,0x51CB,0x5256,0x525C,0x5254,/* 0xE0-0xE7 */ - 0x525B,0x525D,0x532A,0x537F,0x539F,0x539D,0x53DF,0x54E8,/* 0xE8-0xEF */ - 0x5510,0x5501,0x5537,0x54FC,0x54E5,0x54F2,0x5506,0x54FA,/* 0xF0-0xF7 */ - 0x5514,0x54E9,0x54ED,0x54E1,0x5509,0x54EE,0x54EA,0x0000,/* 0xF8-0xFF */ -@@ -507,13 +501,13 @@ - 0x6084,0x609F,0x609A,0x608D,0x6094,0x608C,0x6085,0x6096,/* 0xA8-0xAF */ - 0x6247,0x62F3,0x6308,0x62FF,0x634E,0x633E,0x632F,0x6355,/* 0xB0-0xB7 */ - 0x6342,0x6346,0x634F,0x6349,0x633A,0x6350,0x633D,0x632A,/* 0xB8-0xBF */ -- 0x632B,0x6328,0x634D,0x634C,0x6548,0x6549,0xF9BE,0x65C1,/* 0xC0-0xC7 */ -- 0xF983,0x6642,0x6649,0x664F,0x6643,0x6652,0x664C,0x6645,/* 0xC8-0xCF */ -- 0x6641,0x66F8,0x6714,0x6715,0xF929,0x6821,0x6838,0x6848,/* 0xD0-0xD7 */ -- 0x6846,0x6853,0x6839,0x6842,0x6854,0x6829,0x68B3,0xF9DA,/* 0xD8-0xDF */ -+ 0x632B,0x6328,0x634D,0x634C,0x6548,0x6549,0x6599,0x65C1,/* 0xC0-0xC7 */ -+ 0x65C5,0x6642,0x6649,0x664F,0x6643,0x6652,0x664C,0x6645,/* 0xC8-0xCF */ -+ 0x6641,0x66F8,0x6714,0x6715,0x6717,0x6821,0x6838,0x6848,/* 0xD0-0xD7 */ -+ 0x6846,0x6853,0x6839,0x6842,0x6854,0x6829,0x68B3,0x6817,/* 0xD8-0xDF */ - 0x684C,0x6851,0x683D,0x67F4,0x6850,0x6840,0x683C,0x6843,/* 0xE0-0xE7 */ - 0x682A,0x6845,0x6813,0x6818,0x6841,0x6B8A,0x6B89,0x6BB7,/* 0xE8-0xEF */ -- 0x6C23,0x6C27,0x6C28,0x6C26,0x6C24,0x6CF0,0xF92A,0x6D95,/* 0xF0-0xF7 */ -+ 0x6C23,0x6C27,0x6C28,0x6C26,0x6C24,0x6CF0,0x6D6A,0x6D95,/* 0xF0-0xF7 */ - 0x6D88,0x6D87,0x6D66,0x6D78,0x6D77,0x6D59,0x6D93,0x0000,/* 0xF8-0xFF */ - }; - -@@ -527,12 +521,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x6D6C,0x6D89,0x6D6E,0x6D5A,0x6D74,0x6D69,0x6D8C,0x6D8A,/* 0x40-0x47 */ -- 0x6D79,0x6D85,0x6D65,0x6D94,0x70CA,0x70D8,0x70E4,0xF916,/* 0x48-0x4F */ -- 0xF99F,0x70CF,0x7239,0x7279,0xF92B,0x72F9,0x72FD,0x72F8,/* 0x50-0x57 */ -- 0x72F7,0x7386,0x73ED,0xF9CC,0x73EE,0x73E0,0x73EA,0xF917,/* 0x58-0x5F */ -- 0x7554,0x755D,0x755C,0x755A,0xF9CD,0x75BE,0x75C5,0x75C7,/* 0x60-0x67 */ -+ 0x6D79,0x6D85,0x6D65,0x6D94,0x70CA,0x70D8,0x70E4,0x70D9,/* 0x48-0x4F */ -+ 0x70C8,0x70CF,0x7239,0x7279,0x72FC,0x72F9,0x72FD,0x72F8,/* 0x50-0x57 */ -+ 0x72F7,0x7386,0x73ED,0x7409,0x73EE,0x73E0,0x73EA,0x73DE,/* 0x58-0x5F */ -+ 0x7554,0x755D,0x755C,0x755A,0x7559,0x75BE,0x75C5,0x75C7,/* 0x60-0x67 */ - 0x75B2,0x75B3,0x75BD,0x75BC,0x75B9,0x75C2,0x75B8,0x768B,/* 0x68-0x6F */ -- 0x76B0,0xFA17,0x76CD,0x76CE,0x7729,0x771F,0x7720,0x7728,/* 0x70-0x77 */ -+ 0x76B0,0x76CA,0x76CD,0x76CE,0x7729,0x771F,0x7720,0x7728,/* 0x70-0x77 */ - 0x77E9,0x7830,0x7827,0x7838,0x781D,0x7834,0x7837,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ -@@ -540,17 +534,17 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x7825,0x782D,0x7820,0x781F,0x7832,0x7955,0x7950,/* 0xA0-0xA7 */ -- 0x7960,0x795F,0x7956,0xFA19,0x795D,0x7957,0x795A,0x79E4,/* 0xA8-0xAF */ -+ 0x7960,0x795F,0x7956,0x795E,0x795D,0x7957,0x795A,0x79E4,/* 0xA8-0xAF */ - 0x79E3,0x79E7,0x79DF,0x79E6,0x79E9,0x79D8,0x7A84,0x7A88,/* 0xB0-0xB7 */ - 0x7AD9,0x7B06,0x7B11,0x7C89,0x7D21,0x7D17,0x7D0B,0x7D0A,/* 0xB8-0xBF */ -- 0x7D20,0xF96A,0x7D14,0xF9CF,0x7D15,0x7D1A,0x7D1C,0x7D0D,/* 0xC0-0xC7 */ -+ 0x7D20,0x7D22,0x7D14,0x7D10,0x7D15,0x7D1A,0x7D1C,0x7D0D,/* 0xC0-0xC7 */ - 0x7D19,0x7D1B,0x7F3A,0x7F5F,0x7F94,0x7FC5,0x7FC1,0x8006,/* 0xC8-0xCF */ - 0x8018,0x8015,0x8019,0x8017,0x803D,0x803F,0x80F1,0x8102,/* 0xD0-0xD7 */ - 0x80F0,0x8105,0x80ED,0x80F4,0x8106,0x80F8,0x80F3,0x8108,/* 0xD8-0xDF */ - 0x80FD,0x810A,0x80FC,0x80EF,0x81ED,0x81EC,0x8200,0x8210,/* 0xE0-0xE7 */ - 0x822A,0x822B,0x8228,0x822C,0x82BB,0x832B,0x8352,0x8354,/* 0xE8-0xEF */ - 0x834A,0x8338,0x8350,0x8349,0x8335,0x8334,0x834F,0x8332,/* 0xF0-0xF7 */ -- 0x8339,0xF9FE,0x8317,0x8340,0x8331,0x8328,0x8343,0x0000,/* 0xF8-0xFF */ -+ 0x8339,0x8336,0x8317,0x8340,0x8331,0x8328,0x8343,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_B0[256] = { -@@ -565,7 +559,7 @@ - 0x8654,0x868A,0x86AA,0x8693,0x86A4,0x86A9,0x868C,0x86A3,/* 0x40-0x47 */ - 0x869C,0x8870,0x8877,0x8881,0x8882,0x887D,0x8879,0x8A18,/* 0x48-0x4F */ - 0x8A10,0x8A0E,0x8A0C,0x8A15,0x8A0A,0x8A17,0x8A13,0x8A16,/* 0x50-0x57 */ -- 0x8A0F,0x8A11,0xF900,0x8C7A,0x8C79,0x8CA1,0x8CA2,0x8D77,/* 0x58-0x5F */ -+ 0x8A0F,0x8A11,0x8C48,0x8C7A,0x8C79,0x8CA1,0x8CA2,0x8D77,/* 0x58-0x5F */ - 0x8EAC,0x8ED2,0x8ED4,0x8ECF,0x8FB1,0x9001,0x9006,0x8FF7,/* 0x60-0x67 */ - 0x9000,0x8FFA,0x8FF4,0x9003,0x8FFD,0x9005,0x8FF8,0x9095,/* 0x68-0x6F */ - 0x90E1,0x90DD,0x90E2,0x9152,0x914D,0x914C,0x91D8,0x91DD,/* 0x70-0x77 */ -@@ -579,9 +573,9 @@ - 0x99AC,0x9AA8,0x9AD8,0x9B25,0x9B32,0x9B3C,0x4E7E,0x507A,/* 0xA8-0xAF */ - 0x507D,0x505C,0x5047,0x5043,0x504C,0x505A,0x5049,0x5065,/* 0xB0-0xB7 */ - 0x5076,0x504E,0x5055,0x5075,0x5074,0x5077,0x504F,0x500F,/* 0xB8-0xBF */ -- 0x506F,0x506D,0x515C,0x5195,0x51F0,0x526A,0x526F,0xF952,/* 0xC0-0xC7 */ -- 0x52D9,0x52D8,0x52D5,0x5310,0x530F,0x5319,0xF9EB,0x5340,/* 0xC8-0xCF */ -- 0x533E,0xF96B,0x66FC,0x5546,0x556A,0x5566,0x5544,0x555E,/* 0xD0-0xD7 */ -+ 0x506F,0x506D,0x515C,0x5195,0x51F0,0x526A,0x526F,0x52D2,/* 0xC0-0xC7 */ -+ 0x52D9,0x52D8,0x52D5,0x5310,0x530F,0x5319,0x533F,0x5340,/* 0xC8-0xCF */ -+ 0x533E,0x53C3,0x66FC,0x5546,0x556A,0x5566,0x5544,0x555E,/* 0xD0-0xD7 */ - 0x5561,0x5543,0x554A,0x5531,0x5556,0x554F,0x5555,0x552F,/* 0xD8-0xDF */ - 0x5564,0x5538,0x552E,0x555C,0x552C,0x5563,0x5533,0x5541,/* 0xE0-0xE7 */ - 0x5557,0x5708,0x570B,0x5709,0x57DF,0x5805,0x580A,0x5806,/* 0xE8-0xEF */ -@@ -601,7 +595,7 @@ - 0x5A3C,0x5A62,0x5A5A,0x5A46,0x5A4A,0x5B70,0x5BC7,0x5BC5,/* 0x40-0x47 */ - 0x5BC4,0x5BC2,0x5BBF,0x5BC6,0x5C09,0x5C08,0x5C07,0x5C60,/* 0x48-0x4F */ - 0x5C5C,0x5C5D,0x5D07,0x5D06,0x5D0E,0x5D1B,0x5D16,0x5D22,/* 0x50-0x57 */ -- 0x5D11,0x5D29,0x5D14,0xF9D5,0x5D24,0x5D27,0x5D17,0x5DE2,/* 0x58-0x5F */ -+ 0x5D11,0x5D29,0x5D14,0x5D19,0x5D24,0x5D27,0x5D17,0x5DE2,/* 0x58-0x5F */ - 0x5E38,0x5E36,0x5E33,0x5E37,0x5EB7,0x5EB8,0x5EB6,0x5EB5,/* 0x60-0x67 */ - 0x5EBE,0x5F35,0x5F37,0x5F57,0x5F6C,0x5F69,0x5F6B,0x5F97,/* 0x68-0x6F */ - 0x5F99,0x5F9E,0x5F98,0x5FA1,0x5FA0,0x5F9C,0x607F,0x60A3,/* 0x70-0x77 */ -@@ -613,16 +607,16 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x60C5,0x60BB,0x60B5,0x60DC,0x60BC,0x60D8,0x60D5,/* 0xA0-0xA7 */ - 0x60C6,0x60DF,0x60B8,0x60DA,0x60C7,0x621A,0x621B,0x6248,/* 0xA8-0xAF */ -- 0xF975,0x63A7,0x6372,0x6396,0x63A2,0x63A5,0x6377,0x6367,/* 0xB0-0xB7 */ -+ 0x63A0,0x63A7,0x6372,0x6396,0x63A2,0x63A5,0x6377,0x6367,/* 0xB0-0xB7 */ - 0x6398,0x63AA,0x6371,0x63A9,0x6389,0x6383,0x639B,0x636B,/* 0xB8-0xBF */ - 0x63A8,0x6384,0x6388,0x6399,0x63A1,0x63AC,0x6392,0x638F,/* 0xC0-0xC7 */ -- 0x6380,0xF9A4,0x6369,0x6368,0x637A,0x655D,0x6556,0x6551,/* 0xC8-0xCF */ -+ 0x6380,0x637B,0x6369,0x6368,0x637A,0x655D,0x6556,0x6551,/* 0xC8-0xCF */ - 0x6559,0x6557,0x555F,0x654F,0x6558,0x6555,0x6554,0x659C,/* 0xD0-0xD7 */ - 0x659B,0x65AC,0x65CF,0x65CB,0x65CC,0x65CE,0x665D,0x665A,/* 0xD8-0xDF */ -- 0x6664,0x6668,0x6666,0x665E,0x66F9,0x52D7,0x671B,0xF97A,/* 0xE0-0xE7 */ -+ 0x6664,0x6668,0x6666,0x665E,0x66F9,0x52D7,0x671B,0x6881,/* 0xE0-0xE7 */ - 0x68AF,0x68A2,0x6893,0x68B5,0x687F,0x6876,0x68B1,0x68A7,/* 0xE8-0xEF */ - 0x6897,0x68B0,0x6883,0x68C4,0x68AD,0x6886,0x6885,0x6894,/* 0xF0-0xF7 */ -- 0x689D,0xF9E2,0x689F,0x68A1,0x6882,0x6B32,0xF970,0x0000,/* 0xF8-0xFF */ -+ 0x689D,0x68A8,0x689F,0x68A1,0x6882,0x6B32,0x6BBA,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_B2[256] = { -@@ -635,27 +629,27 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x6BEB,0x6BEC,0x6C2B,0x6D8E,0x6DBC,0x6DF3,0x6DD9,0x6DB2,/* 0x40-0x47 */ -- 0x6DE1,0x6DCC,0x6DE4,0x6DFB,0x6DFA,0x6E05,0x6DC7,0xF9F5,/* 0x48-0x4F */ -+ 0x6DE1,0x6DCC,0x6DE4,0x6DFB,0x6DFA,0x6E05,0x6DC7,0x6DCB,/* 0x48-0x4F */ - 0x6DAF,0x6DD1,0x6DAE,0x6DDE,0x6DF9,0x6DB8,0x6DF7,0x6DF5,/* 0x50-0x57 */ -- 0x6DC5,0x6DD2,0x6E1A,0x6DB5,0xF94D,0x6DEB,0x6DD8,0xF9D6,/* 0x58-0x5F */ -+ 0x6DC5,0x6DD2,0x6E1A,0x6DB5,0x6DDA,0x6DEB,0x6DD8,0x6DEA,/* 0x58-0x5F */ - 0x6DF1,0x6DEE,0x6DE8,0x6DC6,0x6DC4,0x6DAA,0x6DEC,0x6DBF,/* 0x60-0x67 */ - 0x6DE6,0x70F9,0x7109,0x710A,0x70FD,0x70EF,0x723D,0x727D,/* 0x68-0x6F */ -- 0x7281,0x731C,0x731B,0x7316,0x7313,0x7319,0xF9DB,0x7405,/* 0x70-0x77 */ -- 0x740A,0x7403,0xF9E4,0x73FE,0x740D,0x74E0,0x74F6,0x0000,/* 0x78-0x7F */ -+ 0x7281,0x731C,0x731B,0x7316,0x7313,0x7319,0x7387,0x7405,/* 0x70-0x77 */ -+ 0x740A,0x7403,0x7406,0x73FE,0x740D,0x74E0,0x74F6,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x74F7,0x751C,0x7522,0xF976,0x7566,0x7562,0xF962,/* 0xA0-0xA7 */ -+ 0x0000,0x74F7,0x751C,0x7522,0x7565,0x7566,0x7562,0x7570,/* 0xA0-0xA7 */ - 0x758F,0x75D4,0x75D5,0x75B5,0x75CA,0x75CD,0x768E,0x76D4,/* 0xA8-0xAF */ - 0x76D2,0x76DB,0x7737,0x773E,0x773C,0x7736,0x7738,0x773A,/* 0xB0-0xB7 */ -- 0xF9CE,0x7843,0x784E,0xFA1A,0x7968,0x796D,0x79FB,0x7A92,/* 0xB8-0xBF */ -- 0x7A95,0xF9F8,0x7B28,0x7B1B,0x7B2C,0x7B26,0x7B19,0x7B1E,/* 0xC0-0xC7 */ -- 0x7B2E,0xF9F9,0x7C97,0x7C95,0x7D46,0x7D43,0x7D71,0x7D2E,/* 0xC8-0xCF */ -- 0x7D39,0x7D3C,0x7D40,0x7D30,0x7D33,0x7D44,0xF94F,0x7D42,/* 0xD0-0xD7 */ -- 0x7D32,0x7D31,0x7F3D,0x7F9E,0xF9AF,0x7FCC,0x7FCE,0x7FD2,/* 0xD8-0xDF */ -- 0x801C,0x804A,0xF9B0,0x812F,0x8116,0x8123,0x812B,0x8129,/* 0xE0-0xE7 */ -+ 0x786B,0x7843,0x784E,0x7965,0x7968,0x796D,0x79FB,0x7A92,/* 0xB8-0xBF */ -+ 0x7A95,0x7B20,0x7B28,0x7B1B,0x7B2C,0x7B26,0x7B19,0x7B1E,/* 0xC0-0xC7 */ -+ 0x7B2E,0x7C92,0x7C97,0x7C95,0x7D46,0x7D43,0x7D71,0x7D2E,/* 0xC8-0xCF */ -+ 0x7D39,0x7D3C,0x7D40,0x7D30,0x7D33,0x7D44,0x7D2F,0x7D42,/* 0xD0-0xD7 */ -+ 0x7D32,0x7D31,0x7F3D,0x7F9E,0x7F9A,0x7FCC,0x7FCE,0x7FD2,/* 0xD8-0xDF */ -+ 0x801C,0x804A,0x8046,0x812F,0x8116,0x8123,0x812B,0x8129,/* 0xE0-0xE7 */ - 0x8130,0x8124,0x8202,0x8235,0x8237,0x8236,0x8239,0x838E,/* 0xE8-0xEF */ - 0x839E,0x8398,0x8378,0x83A2,0x8396,0x83BD,0x83AB,0x8392,/* 0xF0-0xF7 */ - 0x838A,0x8393,0x8389,0x83A0,0x8377,0x837B,0x837C,0x0000,/* 0xF8-0xFF */ -@@ -676,22 +670,22 @@ - 0x8A2A,0x8A1D,0x8A23,0x8A25,0x8A31,0x8A2D,0x8A1F,0x8A1B,/* 0x58-0x5F */ - 0x8A22,0x8C49,0x8C5A,0x8CA9,0x8CAC,0x8CAB,0x8CA8,0x8CAA,/* 0x60-0x67 */ - 0x8CA7,0x8D67,0x8D66,0x8DBE,0x8DBA,0x8EDB,0x8EDF,0x9019,/* 0x68-0x6F */ -- 0x900D,0x901A,0x9017,0xF99A,0x901F,0x901D,0x9010,0x9015,/* 0x70-0x77 */ -+ 0x900D,0x901A,0x9017,0x9023,0x901F,0x901D,0x9010,0x9015,/* 0x70-0x77 */ - 0x901E,0x9020,0x900F,0x9022,0x9016,0x901B,0x9014,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x90E8,0x90ED,0xFA26,0x9157,0x91CE,0x91F5,0x91E6,/* 0xA0-0xA7 */ -- 0x91E3,0x91E7,0x91ED,0x91E9,0x9589,0x966A,0xF959,0x9673,/* 0xA8-0xAF */ -- 0xF9D3,0x9670,0x9674,0x9676,0x9677,0x966C,0x96C0,0x96EA,/* 0xB0-0xB7 */ -+ 0x0000,0x90E8,0x90ED,0x90FD,0x9157,0x91CE,0x91F5,0x91E6,/* 0xA0-0xA7 */ -+ 0x91E3,0x91E7,0x91ED,0x91E9,0x9589,0x966A,0x9675,0x9673,/* 0xA8-0xAF */ -+ 0x9678,0x9670,0x9674,0x9676,0x9677,0x966C,0x96C0,0x96EA,/* 0xB0-0xB7 */ - 0x96E9,0x7AE0,0x7ADF,0x9802,0x9803,0x9B5A,0x9CE5,0x9E75,/* 0xB8-0xBF */ -- 0xF940,0x9EA5,0x9EBB,0x50A2,0x508D,0x5085,0x5099,0x5091,/* 0xC0-0xC7 */ -+ 0x9E7F,0x9EA5,0x9EBB,0x50A2,0x508D,0x5085,0x5099,0x5091,/* 0xC0-0xC7 */ - 0x5080,0x5096,0x5098,0x509A,0x6700,0x51F1,0x5272,0x5274,/* 0xC8-0xCF */ -- 0x5275,0x5269,0xF92F,0x52DD,0x52DB,0x535A,0x53A5,0x557B,/* 0xD0-0xD7 */ -+ 0x5275,0x5269,0x52DE,0x52DD,0x52DB,0x535A,0x53A5,0x557B,/* 0xD0-0xD7 */ - 0x5580,0x55A7,0x557C,0x558A,0x559D,0x5598,0x5582,0x559C,/* 0xD8-0xDF */ -- 0x55AA,0x5594,0xF90B,0x558B,0x5583,0x55B3,0x55AE,0x559F,/* 0xE0-0xE7 */ -+ 0x55AA,0x5594,0x5587,0x558B,0x5583,0x55B3,0x55AE,0x559F,/* 0xE0-0xE7 */ - 0x553E,0x55B2,0x559A,0x55BB,0x55AC,0x55B1,0x557E,0x5589,/* 0xE8-0xEF */ - 0x55AB,0x5599,0x570D,0x582F,0x582A,0x5834,0x5824,0x5830,/* 0xF0-0xF7 */ - 0x5831,0x5821,0x581D,0x5820,0x58F9,0x58FA,0x5960,0x0000,/* 0xF8-0xFF */ -@@ -708,9 +702,9 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x5A77,0x5A9A,0x5A7F,0x5A92,0x5A9B,0x5AA7,0x5B73,0x5B71,/* 0x40-0x47 */ - 0x5BD2,0x5BCC,0x5BD3,0x5BD0,0x5C0A,0x5C0B,0x5C31,0x5D4C,/* 0x48-0x4F */ -- 0xF921,0x5D34,0x5D47,0x5DFD,0x5E45,0x5E3D,0x5E40,0x5E43,/* 0x50-0x57 */ -- 0x5E7E,0xF928,0x5EC1,0x5EC2,0x5EC4,0x5F3C,0x5F6D,0xF966,/* 0x58-0x5F */ -- 0x5FAA,0x5FA8,0x60D1,0xF9B9,0x60B2,0x60B6,0x60E0,0x611C,/* 0x60-0x67 */ -+ 0x5D50,0x5D34,0x5D47,0x5DFD,0x5E45,0x5E3D,0x5E40,0x5E43,/* 0x50-0x57 */ -+ 0x5E7E,0x5ECA,0x5EC1,0x5EC2,0x5EC4,0x5F3C,0x5F6D,0x5FA9,/* 0x58-0x5F */ -+ 0x5FAA,0x5FA8,0x60D1,0x60E1,0x60B2,0x60B6,0x60E0,0x611C,/* 0x60-0x67 */ - 0x6123,0x60FA,0x6115,0x60F0,0x60FB,0x60F4,0x6168,0x60F1,/* 0x68-0x6F */ - 0x610E,0x60F6,0x6109,0x6100,0x6112,0x621F,0x6249,0x63A3,/* 0x70-0x77 */ - 0x638C,0x63CF,0x63C0,0x63E9,0x63C9,0x63C6,0x63CD,0x0000,/* 0x78-0x7F */ -@@ -722,7 +716,7 @@ - 0x0000,0x63D2,0x63E3,0x63D0,0x63E1,0x63D6,0x63ED,0x63EE,/* 0xA0-0xA7 */ - 0x6376,0x63F4,0x63EA,0x63DB,0x6452,0x63DA,0x63F9,0x655E,/* 0xA8-0xAF */ - 0x6566,0x6562,0x6563,0x6591,0x6590,0x65AF,0x666E,0x6670,/* 0xB0-0xB7 */ -- 0xFA12,0x6676,0x666F,0x6691,0x667A,0x667E,0x6677,0x66FE,/* 0xB8-0xBF */ -+ 0x6674,0x6676,0x666F,0x6691,0x667A,0x667E,0x6677,0x66FE,/* 0xB8-0xBF */ - 0x66FF,0x671F,0x671D,0x68FA,0x68D5,0x68E0,0x68D8,0x68D7,/* 0xC0-0xC7 */ - 0x6905,0x68DF,0x68F5,0x68EE,0x68E7,0x68F9,0x68D2,0x68F2,/* 0xC8-0xCF */ - 0x68E3,0x68CB,0x68CD,0x690D,0x6912,0x690E,0x68C9,0x68DA,/* 0xD0-0xD7 */ -@@ -746,7 +740,7 @@ - 0x7119,0x711A,0x7126,0x7130,0x7121,0x7136,0x716E,0x711C,/* 0x48-0x4F */ - 0x724C,0x7284,0x7280,0x7336,0x7325,0x7334,0x7329,0x743A,/* 0x50-0x57 */ - 0x742A,0x7433,0x7422,0x7425,0x7435,0x7436,0x7434,0x742F,/* 0x58-0x5F */ -- 0x741B,0x7426,0x7428,0x7525,0x7526,0x756B,0x756A,0xF9E5,/* 0x60-0x67 */ -+ 0x741B,0x7426,0x7428,0x7525,0x7526,0x756B,0x756A,0x75E2,/* 0x60-0x67 */ - 0x75DB,0x75E3,0x75D9,0x75D8,0x75DE,0x75E0,0x767B,0x767C,/* 0x68-0x6F */ - 0x7696,0x7693,0x76B4,0x76DC,0x774F,0x77ED,0x785D,0x786C,/* 0x70-0x77 */ - 0x786F,0x7A0D,0x7A08,0x7A0B,0x7A05,0x7A00,0x7A98,0x0000,/* 0x78-0x7F */ -@@ -762,10 +756,10 @@ - 0x800B,0x8052,0x8085,0x8155,0x8154,0x814B,0x8151,0x814E,/* 0xC0-0xC7 */ - 0x8139,0x8146,0x813E,0x814C,0x8153,0x8174,0x8212,0x821C,/* 0xC8-0xCF */ - 0x83E9,0x8403,0x83F8,0x840D,0x83E0,0x83C5,0x840B,0x83C1,/* 0xD0-0xD7 */ -- 0x83EF,0xF958,0x83F4,0x8457,0x840A,0x83F0,0x840C,0x83CC,/* 0xD8-0xDF */ -+ 0x83EF,0x83F1,0x83F4,0x8457,0x840A,0x83F0,0x840C,0x83CC,/* 0xD8-0xDF */ - 0x83FD,0x83F2,0x83CA,0x8438,0x840E,0x8404,0x83DC,0x8407,/* 0xE0-0xE7 */ - 0x83D4,0x83DF,0x865B,0x86DF,0x86D9,0x86ED,0x86D4,0x86DB,/* 0xE8-0xEF */ -- 0x86E4,0x86D0,0x86DE,0x8857,0x88C1,0xF9A0,0x88B1,0x8983,/* 0xF0-0xF7 */ -+ 0x86E4,0x86D0,0x86DE,0x8857,0x88C1,0x88C2,0x88B1,0x8983,/* 0xF0-0xF7 */ - 0x8996,0x8A3B,0x8A60,0x8A55,0x8A5E,0x8A3C,0x8A41,0x0000,/* 0xF8-0xFF */ - }; - -@@ -783,8 +777,8 @@ - 0x8CC0,0x8CB4,0x8CB7,0x8CB6,0x8CBF,0x8CB8,0x8D8A,0x8D85,/* 0x50-0x57 */ - 0x8D81,0x8DCE,0x8DDD,0x8DCB,0x8DDA,0x8DD1,0x8DCC,0x8DDB,/* 0x58-0x5F */ - 0x8DC6,0x8EFB,0x8EF8,0x8EFC,0x8F9C,0x902E,0x9035,0x9031,/* 0x60-0x67 */ -- 0xFA25,0x9032,0x9036,0x9102,0x90F5,0x9109,0x90FE,0x9163,/* 0x68-0x6F */ -- 0x9165,0xF97E,0x9214,0x9215,0x9223,0x9209,0x921E,0x920D,/* 0x70-0x77 */ -+ 0x9038,0x9032,0x9036,0x9102,0x90F5,0x9109,0x90FE,0x9163,/* 0x68-0x6F */ -+ 0x9165,0x91CF,0x9214,0x9215,0x9223,0x9209,0x921E,0x920D,/* 0x70-0x77 */ - 0x9210,0x9207,0x9211,0x9594,0x958F,0x958B,0x9591,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ -@@ -792,15 +786,15 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x9593,0x9592,0x958E,0x968A,0x968E,0x968B,0x967D,/* 0xA0-0xA7 */ -- 0x9685,0xF9DC,0x968D,0x9672,0x9684,0x96C1,0x96C5,0x96C4,/* 0xA8-0xAF */ -+ 0x9685,0x9686,0x968D,0x9672,0x9684,0x96C1,0x96C5,0x96C4,/* 0xA8-0xAF */ - 0x96C6,0x96C7,0x96EF,0x96F2,0x97CC,0x9805,0x9806,0x9808,/* 0xB0-0xB7 */ -- 0x98E7,0x98EA,0xFA2A,0x98E9,0x98F2,0x98ED,0x99AE,0x99AD,/* 0xB8-0xBF */ -- 0x9EC3,0x9ECD,0x9ED1,0xF91B,0x50AD,0x50B5,0x50B2,0x50B3,/* 0xC0-0xC7 */ -+ 0x98E7,0x98EA,0x98EF,0x98E9,0x98F2,0x98ED,0x99AE,0x99AD,/* 0xB8-0xBF */ -+ 0x9EC3,0x9ECD,0x9ED1,0x4E82,0x50AD,0x50B5,0x50B2,0x50B3,/* 0xC0-0xC7 */ - 0x50C5,0x50BE,0x50AC,0x50B7,0x50BB,0x50AF,0x50C7,0x527F,/* 0xC8-0xCF */ - 0x5277,0x527D,0x52DF,0x52E6,0x52E4,0x52E2,0x52E3,0x532F,/* 0xD0-0xD7 */ - 0x55DF,0x55E8,0x55D3,0x55E6,0x55CE,0x55DC,0x55C7,0x55D1,/* 0xD8-0xDF */ - 0x55E3,0x55E4,0x55EF,0x55DA,0x55E1,0x55C5,0x55C6,0x55E5,/* 0xE0-0xE7 */ -- 0x55C9,0x5712,0x5713,0xF96C,0x5851,0x5858,0x5857,0xFA10,/* 0xE8-0xEF */ -+ 0x55C9,0x5712,0x5713,0x585E,0x5851,0x5858,0x5857,0x585A,/* 0xE8-0xEF */ - 0x5854,0x586B,0x584C,0x586D,0x584A,0x5862,0x5852,0x584B,/* 0xF0-0xF7 */ - 0x5967,0x5AC1,0x5AC9,0x5ACC,0x5ABE,0x5ABD,0x5ABC,0x0000,/* 0xF8-0xFF */ - }; -@@ -814,13 +808,13 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x5AB3,0x5AC2,0x5AB2,0x5D69,0x5D6F,0x5E4C,0x5E79,0xF9A2,/* 0x40-0x47 */ -+ 0x5AB3,0x5AC2,0x5AB2,0x5D69,0x5D6F,0x5E4C,0x5E79,0x5EC9,/* 0x40-0x47 */ - 0x5EC8,0x5F12,0x5F59,0x5FAC,0x5FAE,0x611A,0x610F,0x6148,/* 0x48-0x4F */ - 0x611F,0x60F3,0x611B,0x60F9,0x6101,0x6108,0x614E,0x614C,/* 0x50-0x57 */ -- 0xF9D9,0x614D,0x613E,0x6134,0x6127,0x610D,0x6106,0x6137,/* 0x58-0x5F */ -+ 0x6144,0x614D,0x613E,0x6134,0x6127,0x610D,0x6106,0x6137,/* 0x58-0x5F */ - 0x6221,0x6222,0x6413,0x643E,0x641E,0x642A,0x642D,0x643D,/* 0x60-0x67 */ - 0x642C,0x640F,0x641C,0x6414,0x640D,0x6436,0x6416,0x6417,/* 0x68-0x6F */ -- 0x6406,0x656C,0x659F,0x65B0,0x6697,0x6689,0x6687,0xF9C5,/* 0x70-0x77 */ -+ 0x6406,0x656C,0x659F,0x65B0,0x6697,0x6689,0x6687,0x6688,/* 0x70-0x77 */ - 0x6696,0x6684,0x6698,0x668D,0x6703,0x6994,0x696D,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ -@@ -831,9 +825,9 @@ - 0x694A,0x6968,0x696B,0x695E,0x6953,0x6979,0x6986,0x695D,/* 0xA8-0xAF */ - 0x6963,0x695B,0x6B47,0x6B72,0x6BC0,0x6BBF,0x6BD3,0x6BFD,/* 0xB0-0xB7 */ - 0x6EA2,0x6EAF,0x6ED3,0x6EB6,0x6EC2,0x6E90,0x6E9D,0x6EC7,/* 0xB8-0xBF */ -- 0x6EC5,0x6EA5,0x6E98,0x6EBC,0xF9EC,0x6EAB,0xF904,0x6E96,/* 0xC0-0xC7 */ -- 0xF9CB,0x6EC4,0x6ED4,0x6EAA,0x6EA7,0x6EB4,0x714E,0x7159,/* 0xC8-0xCF */ -- 0x7169,0x7164,0xF993,0x7167,0x715C,0x716C,0x7166,0x714C,/* 0xD0-0xD7 */ -+ 0x6EC5,0x6EA5,0x6E98,0x6EBC,0x6EBA,0x6EAB,0x6ED1,0x6E96,/* 0xC0-0xC7 */ -+ 0x6E9C,0x6EC4,0x6ED4,0x6EAA,0x6EA7,0x6EB4,0x714E,0x7159,/* 0xC8-0xCF */ -+ 0x7169,0x7164,0x7149,0x7167,0x715C,0x716C,0x7166,0x714C,/* 0xD0-0xD7 */ - 0x7165,0x715E,0x7146,0x7168,0x7156,0x723A,0x7252,0x7337,/* 0xD8-0xDF */ - 0x7345,0x733F,0x733E,0x746F,0x745A,0x7455,0x745F,0x745E,/* 0xE0-0xE7 */ - 0x7441,0x743F,0x7459,0x745B,0x745C,0x7576,0x7578,0x7600,/* 0xE8-0xEF */ -@@ -851,8 +845,8 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x7779,0x776A,0x776C,0x775C,0x7765,0x7768,0x7762,0x77EE,/* 0x40-0x47 */ -- 0x788E,0x78B0,0x7897,0x7898,0xF93B,0x7889,0x787C,0x7891,/* 0x48-0x4F */ -- 0x7893,0x787F,0x797A,0xF93C,0x7981,0x842C,0x79BD,0xF956,/* 0x50-0x57 */ -+ 0x788E,0x78B0,0x7897,0x7898,0x788C,0x7889,0x787C,0x7891,/* 0x48-0x4F */ -+ 0x7893,0x787F,0x797A,0x797F,0x7981,0x842C,0x79BD,0x7A1C,/* 0x50-0x57 */ - 0x7A1A,0x7A20,0x7A14,0x7A1F,0x7A1E,0x7A9F,0x7AA0,0x7B77,/* 0x58-0x5F */ - 0x7BC0,0x7B60,0x7B6E,0x7B67,0x7CB1,0x7CB3,0x7CB5,0x7D93,/* 0x60-0x67 */ - 0x7D79,0x7D91,0x7D81,0x7D8F,0x7D5B,0x7F6E,0x7F69,0x7F6A,/* 0x68-0x6F */ -@@ -864,16 +858,16 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x8179,0x817A,0x8166,0x8205,0x8247,0x8482,0x8477,/* 0xA0-0xA7 */ -- 0xF918,0x8431,0x8475,0x8466,0x846B,0xF96E,0x846C,0x845B,/* 0xA8-0xAF */ -+ 0x843D,0x8431,0x8475,0x8466,0x846B,0x8449,0x846C,0x845B,/* 0xA8-0xAF */ - 0x843C,0x8435,0x8461,0x8463,0x8469,0x846D,0x8446,0x865E,/* 0xB0-0xB7 */ -- 0xF936,0x865F,0x86F9,0x8713,0x8708,0x8707,0x8700,0x86FE,/* 0xB8-0xBF */ -+ 0x865C,0x865F,0x86F9,0x8713,0x8708,0x8707,0x8700,0x86FE,/* 0xB8-0xBF */ - 0x86FB,0x8702,0x8703,0x8706,0x870A,0x8859,0x88DF,0x88D4,/* 0xC0-0xC7 */ -- 0x88D9,0x88DC,0x88D8,0x88DD,0xF9E8,0x88CA,0x88D5,0x88D2,/* 0xC8-0xCF */ -+ 0x88D9,0x88DC,0x88D8,0x88DD,0x88E1,0x88CA,0x88D5,0x88D2,/* 0xC8-0xCF */ - 0x899C,0x89E3,0x8A6B,0x8A72,0x8A73,0x8A66,0x8A69,0x8A70,/* 0xD0-0xD7 */ - 0x8A87,0x8A7C,0x8A63,0x8AA0,0x8A71,0x8A85,0x8A6D,0x8A62,/* 0xD8-0xDF */ - 0x8A6E,0x8A6C,0x8A79,0x8A7B,0x8A3E,0x8A68,0x8C62,0x8C8A,/* 0xE0-0xE7 */ -- 0x8C89,0x8CCA,0x8CC7,0xF903,0x8CC4,0x8CB2,0x8CC3,0xF948,/* 0xE8-0xEF */ -- 0x8CC5,0x8DE1,0x8DDF,0x8DE8,0xF937,0x8DF3,0x8DFA,0x8DEA,/* 0xF0-0xF7 */ -+ 0x8C89,0x8CCA,0x8CC7,0x8CC8,0x8CC4,0x8CB2,0x8CC3,0x8CC2,/* 0xE8-0xEF */ -+ 0x8CC5,0x8DE1,0x8DDF,0x8DE8,0x8DEF,0x8DF3,0x8DFA,0x8DEA,/* 0xF0-0xF7 */ - 0x8DE4,0x8DE6,0x8EB2,0x8F03,0x8F09,0x8EFE,0x8F0A,0x0000,/* 0xF8-0xFF */ - }; - -@@ -888,12 +882,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x8F9F,0x8FB2,0x904B,0x904A,0x9053,0x9042,0x9054,0x903C,/* 0x40-0x47 */ - 0x9055,0x9050,0x9047,0x904F,0x904E,0x904D,0x9051,0x903E,/* 0x48-0x4F */ -- 0x9041,0x9112,0x9117,0x916C,0xF919,0x9169,0x91C9,0x9237,/* 0x50-0x57 */ -+ 0x9041,0x9112,0x9117,0x916C,0x916A,0x9169,0x91C9,0x9237,/* 0x50-0x57 */ - 0x9257,0x9238,0x923D,0x9240,0x923E,0x925B,0x924B,0x9264,/* 0x58-0x5F */ -- 0x9251,0xF9B1,0x9249,0x924D,0x9245,0x9239,0x923F,0x925A,/* 0x60-0x67 */ -+ 0x9251,0x9234,0x9249,0x924D,0x9245,0x9239,0x923F,0x925A,/* 0x60-0x67 */ - 0x9598,0x9698,0x9694,0x9695,0x96CD,0x96CB,0x96C9,0x96CA,/* 0x68-0x6F */ -- 0xF949,0x96FB,0x96F9,0xF9B2,0xFA1C,0x9774,0x9776,0x9810,/* 0x70-0x77 */ -- 0x9811,0x9813,0x980A,0x9812,0x980C,0xFA2B,0x98F4,0x0000,/* 0x78-0x7F */ -+ 0x96F7,0x96FB,0x96F9,0x96F6,0x9756,0x9774,0x9776,0x9810,/* 0x70-0x77 */ -+ 0x9811,0x9813,0x980A,0x9812,0x980C,0x98FC,0x98F4,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ -@@ -901,16 +895,16 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x98FD,0x98FE,0x99B3,0x99B1,0x99B4,0x9AE1,0x9CE9,/* 0xA0-0xA7 */ - 0x9E82,0x9F0E,0x9F13,0x9F20,0x50E7,0x50EE,0x50E5,0x50D6,/* 0xA8-0xAF */ -- 0x50ED,0xF9BB,0x50D5,0x50CF,0x50D1,0x50F1,0x50CE,0x50E9,/* 0xB0-0xB7 */ -+ 0x50ED,0x50DA,0x50D5,0x50CF,0x50D1,0x50F1,0x50CE,0x50E9,/* 0xB0-0xB7 */ - 0x5162,0x51F3,0x5283,0x5282,0x5331,0x53AD,0x55FE,0x5600,/* 0xB8-0xBF */ - 0x561B,0x5617,0x55FD,0x5614,0x5606,0x5609,0x560D,0x560E,/* 0xC0-0xC7 */ - 0x55F7,0x5616,0x561F,0x5608,0x5610,0x55F6,0x5718,0x5716,/* 0xC8-0xCF */ - 0x5875,0x587E,0x5883,0x5893,0x588A,0x5879,0x5885,0x587D,/* 0xD0-0xD7 */ - 0x58FD,0x5925,0x5922,0x5924,0x596A,0x5969,0x5AE1,0x5AE6,/* 0xD8-0xDF */ -- 0x5AE9,0x5AD7,0x5AD6,0x5AD8,0x5AE3,0x5B75,0x5BDE,0xF9AA,/* 0xE0-0xE7 */ -+ 0x5AE9,0x5AD7,0x5AD6,0x5AD8,0x5AE3,0x5B75,0x5BDE,0x5BE7,/* 0xE0-0xE7 */ - 0x5BE1,0x5BE5,0x5BE6,0x5BE8,0x5BE2,0x5BE4,0x5BDF,0x5C0D,/* 0xE8-0xEF */ -- 0xF94B,0x5D84,0x5D87,0x5E5B,0x5E63,0x5E55,0x5E57,0x5E54,/* 0xF0-0xF7 */ -- 0xFA0B,0x5ED6,0x5F0A,0x5F46,0x5F70,0x5FB9,0x6147,0x0000,/* 0xF8-0xFF */ -+ 0x5C62,0x5D84,0x5D87,0x5E5B,0x5E63,0x5E55,0x5E57,0x5E54,/* 0xF0-0xF7 */ -+ 0x5ED3,0x5ED6,0x5F0A,0x5F46,0x5F70,0x5FB9,0x6147,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_BA[256] = { -@@ -929,23 +923,23 @@ - 0x69C1,0x69AE,0x69D3,0x69CB,0x699B,0x69B7,0x69BB,0x69AB,/* 0x60-0x67 */ - 0x69B4,0x69D0,0x69CD,0x69AD,0x69CC,0x69A6,0x69C3,0x69A3,/* 0x68-0x6F */ - 0x6B49,0x6B4C,0x6C33,0x6F33,0x6F14,0x6EFE,0x6F13,0x6EF4,/* 0x70-0x77 */ -- 0x6F29,0x6F3E,0x6F20,0x6F2C,0xF94E,0x6F02,0x6F22,0x0000,/* 0x78-0x7F */ -+ 0x6F29,0x6F3E,0x6F20,0x6F2C,0x6F0F,0x6F02,0x6F22,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x6EFF,0x6EEF,0x6F06,0x6F31,0x6F38,0x6F32,0xF992,/* 0xA0-0xA7 */ -+ 0x0000,0x6EFF,0x6EEF,0x6F06,0x6F31,0x6F38,0x6F32,0x6F23,/* 0xA0-0xA7 */ - 0x6F15,0x6F2B,0x6F2F,0x6F88,0x6F2A,0x6EEC,0x6F01,0x6EF2,/* 0xA8-0xAF */ - 0x6ECC,0x6EF7,0x7194,0x7199,0x717D,0x718A,0x7184,0x7192,/* 0xB0-0xB7 */ - 0x723E,0x7292,0x7296,0x7344,0x7350,0x7464,0x7463,0x746A,/* 0xB8-0xBF */ - 0x7470,0x746D,0x7504,0x7591,0x7627,0x760D,0x760B,0x7609,/* 0xC0-0xC7 */ - 0x7613,0x76E1,0x76E3,0x7784,0x777D,0x777F,0x7761,0x78C1,/* 0xC8-0xCF */ -- 0x789F,0x78A7,0x78B3,0x78A9,0x78A3,0x798E,0xFA1B,0x798D,/* 0xD0-0xD7 */ -+ 0x789F,0x78A7,0x78B3,0x78A9,0x78A3,0x798E,0x798F,0x798D,/* 0xD0-0xD7 */ - 0x7A2E,0x7A31,0x7AAA,0x7AA9,0x7AED,0x7AEF,0x7BA1,0x7B95,/* 0xD8-0xDF */ - 0x7B8B,0x7B75,0x7B97,0x7B9D,0x7B94,0x7B8F,0x7BB8,0x7B87,/* 0xE0-0xE7 */ -- 0x7B84,0x7CB9,0x7CBD,0xFA1D,0x7DBB,0x7DB0,0x7D9C,0x7DBD,/* 0xE8-0xEF */ -- 0xF957,0xF93D,0x7DCA,0x7DB4,0x7DB2,0x7DB1,0x7DBA,0x7DA2,/* 0xF0-0xF7 */ -+ 0x7B84,0x7CB9,0x7CBD,0x7CBE,0x7DBB,0x7DB0,0x7D9C,0x7DBD,/* 0xE8-0xEF */ -+ 0x7DBE,0x7DA0,0x7DCA,0x7DB4,0x7DB2,0x7DB1,0x7DBA,0x7DA2,/* 0xF0-0xF7 */ - 0x7DBF,0x7DB5,0x7DB8,0x7DAD,0x7DD2,0x7DC7,0x7DAC,0x0000,/* 0xF8-0xFF */ - }; - -@@ -964,14 +958,14 @@ - 0x8499,0x849E,0x84B2,0x849C,0x84CB,0x84B8,0x84C0,0x84D3,/* 0x58-0x5F */ - 0x8490,0x84BC,0x84D1,0x84CA,0x873F,0x871C,0x873B,0x8722,/* 0x60-0x67 */ - 0x8725,0x8734,0x8718,0x8755,0x8737,0x8729,0x88F3,0x8902,/* 0x68-0x6F */ -- 0x88F4,0x88F9,0xF912,0x88FD,0x88E8,0x891A,0x88EF,0x8AA6,/* 0x70-0x77 */ -+ 0x88F4,0x88F9,0x88F8,0x88FD,0x88E8,0x891A,0x88EF,0x8AA6,/* 0x70-0x77 */ - 0x8A8C,0x8A9E,0x8AA3,0x8A8D,0x8AA1,0x8A93,0x8AA4,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0xF9A1,0x8AA5,0x8AA8,0x8A98,0x8A91,0x8A9A,0x8AA7,/* 0xA0-0xA7 */ -+ 0x0000,0x8AAA,0x8AA5,0x8AA8,0x8A98,0x8A91,0x8A9A,0x8AA7,/* 0xA0-0xA7 */ - 0x8C6A,0x8C8D,0x8C8C,0x8CD3,0x8CD1,0x8CD2,0x8D6B,0x8D99,/* 0xA8-0xAF */ - 0x8D95,0x8DFC,0x8F14,0x8F12,0x8F15,0x8F13,0x8FA3,0x9060,/* 0xB0-0xB7 */ - 0x9058,0x905C,0x9063,0x9059,0x905E,0x9062,0x905D,0x905B,/* 0xB8-0xBF */ -@@ -979,10 +973,10 @@ - 0x9280,0x9285,0x9298,0x9296,0x927B,0x9293,0x929C,0x92A8,/* 0xC8-0xCF */ - 0x927C,0x9291,0x95A1,0x95A8,0x95A9,0x95A3,0x95A5,0x95A4,/* 0xD0-0xD7 */ - 0x9699,0x969C,0x969B,0x96CC,0x96D2,0x9700,0x977C,0x9785,/* 0xD8-0xDF */ -- 0x97F6,0x9817,0xF9B4,0x98AF,0x98B1,0x9903,0x9905,0x990C,/* 0xE0-0xE7 */ -+ 0x97F6,0x9817,0x9818,0x98AF,0x98B1,0x9903,0x9905,0x990C,/* 0xE0-0xE7 */ - 0x9909,0x99C1,0x9AAF,0x9AB0,0x9AE6,0x9B41,0x9B42,0x9CF4,/* 0xE8-0xEF */ - 0x9CF6,0x9CF3,0x9EBC,0x9F3B,0x9F4A,0x5104,0x5100,0x50FB,/* 0xF0-0xF7 */ -- 0x50F5,0x50F9,0x5102,0x5108,0x5109,0x5105,0xF954,0x0000,/* 0xF8-0xFF */ -+ 0x50F5,0x50F9,0x5102,0x5108,0x5109,0x5105,0x51DC,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_BC[256] = { -@@ -994,12 +988,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x5287,0x5288,0xF9C7,0x528D,0x528A,0x52F0,0x53B2,0x562E,/* 0x40-0x47 */ -+ 0x5287,0x5288,0x5289,0x528D,0x528A,0x52F0,0x53B2,0x562E,/* 0x40-0x47 */ - 0x563B,0x5639,0x5632,0x563F,0x5634,0x5629,0x5653,0x564E,/* 0x48-0x4F */ - 0x5657,0x5674,0x5636,0x562F,0x5630,0x5880,0x589F,0x589E,/* 0x50-0x57 */ - 0x58B3,0x589C,0x58AE,0x58A9,0x58A6,0x596D,0x5B09,0x5AFB,/* 0x58-0x5F */ -- 0x5B0B,0x5AF5,0x5B0C,0x5B08,0xF9BC,0x5BEC,0x5BE9,0x5BEB,/* 0x60-0x67 */ -- 0x5C64,0xF9DF,0x5D9D,0x5D94,0x5E62,0x5E5F,0x5E61,0x5EE2,/* 0x68-0x6F */ -+ 0x5B0B,0x5AF5,0x5B0C,0x5B08,0x5BEE,0x5BEC,0x5BE9,0x5BEB,/* 0x60-0x67 */ -+ 0x5C64,0x5C65,0x5D9D,0x5D94,0x5E62,0x5E5F,0x5E61,0x5EE2,/* 0x68-0x6F */ - 0x5EDA,0x5EDF,0x5EDD,0x5EE3,0x5EE0,0x5F48,0x5F71,0x5FB7,/* 0x70-0x77 */ - 0x5FB5,0x6176,0x6167,0x616E,0x615D,0x6155,0x6182,0x0000,/* 0x78-0x7F */ - -@@ -1007,18 +1001,18 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x617C,0x6170,0x616B,0x617E,0x61A7,0xF98F,0x61AB,/* 0xA0-0xA7 */ -- 0x618E,0x61AC,0x619A,0x61A4,0x6194,0x61AE,0xF9D2,0x6469,/* 0xA8-0xAF */ -+ 0x0000,0x617C,0x6170,0x616B,0x617E,0x61A7,0x6190,0x61AB,/* 0xA0-0xA7 */ -+ 0x618E,0x61AC,0x619A,0x61A4,0x6194,0x61AE,0x622E,0x6469,/* 0xA8-0xAF */ - 0x646F,0x6479,0x649E,0x64B2,0x6488,0x6490,0x64B0,0x64A5,/* 0xB0-0xB7 */ -- 0x6493,0x6495,0x64A9,0x6492,0x64AE,0x64AD,0x64AB,0xF991,/* 0xB8-0xBF */ -- 0x64AC,0x6499,0x64A2,0x64B3,0x6575,0x6577,0xF969,0x66AE,/* 0xC0-0xC7 */ -- 0x66AB,0xFA06,0x66B1,0x6A23,0x6A1F,0x69E8,0x6A01,0x6A1E,/* 0xC8-0xCF */ -- 0x6A19,0x69FD,0x6A21,0xF94C,0x6A0A,0x69F3,0xF9BF,0x6A05,/* 0xD0-0xD7 */ -+ 0x6493,0x6495,0x64A9,0x6492,0x64AE,0x64AD,0x64AB,0x649A,/* 0xB8-0xBF */ -+ 0x64AC,0x6499,0x64A2,0x64B3,0x6575,0x6577,0x6578,0x66AE,/* 0xC0-0xC7 */ -+ 0x66AB,0x66B4,0x66B1,0x6A23,0x6A1F,0x69E8,0x6A01,0x6A1E,/* 0xC8-0xCF */ -+ 0x6A19,0x69FD,0x6A21,0x6A13,0x6A0A,0x69F3,0x6A02,0x6A05,/* 0xD0-0xD7 */ - 0x69ED,0x6A11,0x6B50,0x6B4E,0x6BA4,0x6BC5,0x6BC6,0x6F3F,/* 0xD8-0xDF */ - 0x6F7C,0x6F84,0x6F51,0x6F66,0x6F54,0x6F86,0x6F6D,0x6F5B,/* 0xE0-0xE7 */ - 0x6F78,0x6F6E,0x6F8E,0x6F7A,0x6F70,0x6F64,0x6F97,0x6F58,/* 0xE8-0xEF */ - 0x6ED5,0x6F6F,0x6F60,0x6F5F,0x719F,0x71AC,0x71B1,0x71A8,/* 0xF0-0xF7 */ -- 0x7256,0x729B,0x734E,0x7357,0xF9AE,0x748B,0x7483,0x0000,/* 0xF8-0xFF */ -+ 0x7256,0x729B,0x734E,0x7357,0x7469,0x748B,0x7483,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_BD[256] = { -@@ -1032,10 +1026,10 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x747E,0x7480,0x757F,0x7620,0x7629,0x761F,0x7624,0x7626,/* 0x40-0x47 */ - 0x7621,0x7622,0x769A,0x76BA,0x76E4,0x778E,0x7787,0x778C,/* 0x48-0x4F */ -- 0x7791,0x778B,0x78CB,0x78C5,0x78BA,0xF947,0x78BE,0x78D5,/* 0x50-0x57 */ -+ 0x7791,0x778B,0x78CB,0x78C5,0x78BA,0x78CA,0x78BE,0x78D5,/* 0x50-0x57 */ - 0x78BC,0x78D0,0x7A3F,0x7A3C,0x7A40,0x7A3D,0x7A37,0x7A3B,/* 0x58-0x5F */ - 0x7AAF,0x7AAE,0x7BAD,0x7BB1,0x7BC4,0x7BB4,0x7BC6,0x7BC7,/* 0x60-0x67 */ -- 0x7BC1,0x7BA0,0x7BCC,0x7CCA,0x7DE0,0xF996,0x7DEF,0x7DFB,/* 0x68-0x6F */ -+ 0x7BC1,0x7BA0,0x7BCC,0x7CCA,0x7DE0,0x7DF4,0x7DEF,0x7DFB,/* 0x68-0x6F */ - 0x7DD8,0x7DEC,0x7DDD,0x7DE8,0x7DE3,0x7DDA,0x7DDE,0x7DE9,/* 0x70-0x77 */ - 0x7D9E,0x7DD9,0x7DF2,0x7DF9,0x7F75,0x7F77,0x7FAF,0x0000,/* 0x78-0x7F */ - -@@ -1044,17 +1038,17 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x7FE9,0x8026,0x819B,0x819C,0x819D,0x81A0,0x819A,/* 0xA0-0xA7 */ -- 0x8198,0x8517,0x853D,0x851A,0xF999,0x852C,0x852D,0x8513,/* 0xA8-0xAF */ -+ 0x8198,0x8517,0x853D,0x851A,0x84EE,0x852C,0x852D,0x8513,/* 0xA8-0xAF */ - 0x8511,0x8523,0x8521,0x8514,0x84EC,0x8525,0x84FF,0x8506,/* 0xB0-0xB7 */ - 0x8782,0x8774,0x8776,0x8760,0x8766,0x8778,0x8768,0x8759,/* 0xB8-0xBF */ - 0x8757,0x874C,0x8753,0x885B,0x885D,0x8910,0x8907,0x8912,/* 0xC0-0xC7 */ -- 0x8913,0x8915,0x890A,0x8ABC,0xF97D,0x8AC7,0x8AC4,0x8A95,/* 0xC8-0xCF */ -- 0x8ACB,0xFA22,0x8AB2,0x8AC9,0x8AC2,0x8ABF,0x8AB0,0xF941,/* 0xD0-0xD7 */ -- 0x8ACD,0x8AB6,0x8AB9,0x8ADB,0x8C4C,0x8C4E,0xFA16,0x8CE0,/* 0xD8-0xDF */ -+ 0x8913,0x8915,0x890A,0x8ABC,0x8AD2,0x8AC7,0x8AC4,0x8A95,/* 0xC8-0xCF */ -+ 0x8ACB,0x8AF8,0x8AB2,0x8AC9,0x8AC2,0x8ABF,0x8AB0,0x8AD6,/* 0xD0-0xD7 */ -+ 0x8ACD,0x8AB6,0x8AB9,0x8ADB,0x8C4C,0x8C4E,0x8C6C,0x8CE0,/* 0xD8-0xDF */ - 0x8CDE,0x8CE6,0x8CE4,0x8CEC,0x8CED,0x8CE2,0x8CE3,0x8CDC,/* 0xE0-0xE7 */ - 0x8CEA,0x8CE1,0x8D6D,0x8D9F,0x8DA3,0x8E2B,0x8E10,0x8E1D,/* 0xE8-0xEF */ - 0x8E22,0x8E0F,0x8E29,0x8E1F,0x8E21,0x8E1E,0x8EBA,0x8F1D,/* 0xF0-0xF7 */ -- 0x8F1B,0x8F1F,0x8F29,0xF998,0xF9D7,0x8F1C,0x8F1E,0x0000,/* 0xF8-0xFF */ -+ 0x8F1B,0x8F1F,0x8F29,0x8F26,0x8F2A,0x8F1C,0x8F1E,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_BE[256] = { -@@ -1069,28 +1063,28 @@ - 0x8F25,0x9069,0x906E,0x9068,0x906D,0x9077,0x9130,0x912D,/* 0x40-0x47 */ - 0x9127,0x9131,0x9187,0x9189,0x918B,0x9183,0x92C5,0x92BB,/* 0x48-0x4F */ - 0x92B7,0x92EA,0x92AC,0x92E4,0x92C1,0x92B3,0x92BC,0x92D2,/* 0x50-0x57 */ -- 0x92C7,0x92F0,0x92B2,0xF986,0x95B1,0x9704,0x9706,0x9707,/* 0x58-0x5F */ -+ 0x92C7,0x92F0,0x92B2,0x95AD,0x95B1,0x9704,0x9706,0x9707,/* 0x58-0x5F */ - 0x9709,0x9760,0x978D,0x978B,0x978F,0x9821,0x982B,0x981C,/* 0x60-0x67 */ - 0x98B3,0x990A,0x9913,0x9912,0x9918,0x99DD,0x99D0,0x99DF,/* 0x68-0x6F */ - 0x99DB,0x99D1,0x99D5,0x99D2,0x99D9,0x9AB7,0x9AEE,0x9AEF,/* 0x70-0x77 */ -- 0x9B27,0x9B45,0x9B44,0x9B77,0xF939,0x9D06,0x9D09,0x0000,/* 0x78-0x7F */ -+ 0x9B27,0x9B45,0x9B44,0x9B77,0x9B6F,0x9D06,0x9D09,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x9D03,0x9EA9,0x9EBE,0xF989,0x58A8,0x9F52,0x5112,/* 0xA0-0xA7 */ -+ 0x0000,0x9D03,0x9EA9,0x9EBE,0x9ECE,0x58A8,0x9F52,0x5112,/* 0xA0-0xA7 */ - 0x5118,0x5114,0x5110,0x5115,0x5180,0x51AA,0x51DD,0x5291,/* 0xA8-0xAF */ - 0x5293,0x52F3,0x5659,0x566B,0x5679,0x5669,0x5664,0x5678,/* 0xB0-0xB7 */ - 0x566A,0x5668,0x5665,0x5671,0x566F,0x566C,0x5662,0x5676,/* 0xB8-0xBF */ - 0x58C1,0x58BE,0x58C7,0x58C5,0x596E,0x5B1D,0x5B34,0x5B78,/* 0xC0-0xC7 */ - 0x5BF0,0x5C0E,0x5F4A,0x61B2,0x6191,0x61A9,0x618A,0x61CD,/* 0xC8-0xCF */ - 0x61B6,0x61BE,0x61CA,0x61C8,0x6230,0x64C5,0x64C1,0x64CB,/* 0xD0-0xD7 */ -- 0x64BB,0x64BC,0x64DA,0xF930,0x64C7,0x64C2,0x64CD,0x64BF,/* 0xD8-0xDF */ -- 0x64D2,0x64D4,0x64BE,0x6574,0xF98B,0x66C9,0x66B9,0x66C4,/* 0xE0-0xE7 */ -+ 0x64BB,0x64BC,0x64DA,0x64C4,0x64C7,0x64C2,0x64CD,0x64BF,/* 0xD8-0xDF */ -+ 0x64D2,0x64D4,0x64BE,0x6574,0x66C6,0x66C9,0x66B9,0x66C4,/* 0xE0-0xE7 */ - 0x66C7,0x66B8,0x6A3D,0x6A38,0x6A3A,0x6A59,0x6A6B,0x6A58,/* 0xE8-0xEF */ - 0x6A39,0x6A44,0x6A62,0x6A61,0x6A4B,0x6A47,0x6A35,0x6A5F,/* 0xF0-0xF7 */ -- 0x6A48,0x6B59,0xF98C,0x6C05,0x6FC2,0x6FB1,0x6FA1,0x0000,/* 0xF8-0xFF */ -+ 0x6A48,0x6B59,0x6B77,0x6C05,0x6FC2,0x6FB1,0x6FA1,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_BF[256] = { -@@ -1103,30 +1097,30 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x6FC3,0x6FA4,0x6FC1,0x6FA7,0x6FB3,0x6FC0,0x6FB9,0x6FB6,/* 0x40-0x47 */ -- 0x6FA6,0x6FA0,0x6FB4,0x71BE,0x71C9,0xF9EE,0x71D2,0x71C8,/* 0x48-0x4F */ -- 0x71D5,0x71B9,0xF9C0,0x71D9,0x71DC,0x71C3,0x71C4,0x7368,/* 0x50-0x57 */ -- 0x749C,0x74A3,0xF9EF,0x749F,0x749E,0x74E2,0x750C,0x750D,/* 0x58-0x5F */ -- 0x7634,0x7638,0x763A,0xF933,0x76E5,0x77A0,0x779E,0x779F,/* 0x60-0x67 */ -+ 0x6FA6,0x6FA0,0x6FB4,0x71BE,0x71C9,0x71D0,0x71D2,0x71C8,/* 0x48-0x4F */ -+ 0x71D5,0x71B9,0x71CE,0x71D9,0x71DC,0x71C3,0x71C4,0x7368,/* 0x50-0x57 */ -+ 0x749C,0x74A3,0x7498,0x749F,0x749E,0x74E2,0x750C,0x750D,/* 0x58-0x5F */ -+ 0x7634,0x7638,0x763A,0x76E7,0x76E5,0x77A0,0x779E,0x779F,/* 0x60-0x67 */ - 0x77A5,0x78E8,0x78DA,0x78EC,0x78E7,0x79A6,0x7A4D,0x7A4E,/* 0x68-0x6F */ - 0x7A46,0x7A4C,0x7A4B,0x7ABA,0x7BD9,0x7C11,0x7BC9,0x7BE4,/* 0x70-0x77 */ -- 0x7BDB,0x7BE1,0x7BE9,0x7BE6,0x7CD5,0xFA03,0x7E0A,0x0000,/* 0x78-0x7F */ -+ 0x7BDB,0x7BE1,0x7BE9,0x7BE6,0x7CD5,0x7CD6,0x7E0A,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x7E11,0x7E08,0x7E1B,0x7E23,0x7E1E,0x7E1D,0x7E09,/* 0xA0-0xA7 */ -- 0x7E10,0xF9E6,0x7FB2,0x7FF0,0x7FF1,0x7FEE,0x8028,0x81B3,/* 0xA8-0xAF */ -+ 0x7E10,0x7F79,0x7FB2,0x7FF0,0x7FF1,0x7FEE,0x8028,0x81B3,/* 0xA8-0xAF */ - 0x81A9,0x81A8,0x81FB,0x8208,0x8258,0x8259,0x854A,0x8559,/* 0xB0-0xB7 */ - 0x8548,0x8568,0x8569,0x8543,0x8549,0x856D,0x856A,0x855E,/* 0xB8-0xBF */ - 0x8783,0x879F,0x879E,0x87A2,0x878D,0x8861,0x892A,0x8932,/* 0xC0-0xC7 */ - 0x8925,0x892B,0x8921,0x89AA,0x89A6,0x8AE6,0x8AFA,0x8AEB,/* 0xC8-0xCF */ -- 0x8AF1,0x8B00,0x8ADC,0x8AE7,0x8AEE,0xF95D,0x8B01,0x8B02,/* 0xD0-0xD7 */ -+ 0x8AF1,0x8B00,0x8ADC,0x8AE7,0x8AEE,0x8AFE,0x8B01,0x8B02,/* 0xD0-0xD7 */ - 0x8AF7,0x8AED,0x8AF3,0x8AF6,0x8AFC,0x8C6B,0x8C6D,0x8C93,/* 0xD8-0xDF */ -- 0x8CF4,0x8E44,0x8E31,0x8E34,0x8E42,0x8E39,0x8E35,0xFA07,/* 0xE0-0xE7 */ -+ 0x8CF4,0x8E44,0x8E31,0x8E34,0x8E42,0x8E39,0x8E35,0x8F3B,/* 0xE0-0xE7 */ - 0x8F2F,0x8F38,0x8F33,0x8FA8,0x8FA6,0x9075,0x9074,0x9078,/* 0xE8-0xEF */ -- 0x9072,0xF9C3,0x907A,0x9134,0x9192,0x9320,0x9336,0x92F8,/* 0xF0-0xF7 */ -- 0x9333,0x932F,0x9322,0x92FC,0x932B,0xF93F,0x931A,0x0000,/* 0xF8-0xFF */ -+ 0x9072,0x907C,0x907A,0x9134,0x9192,0x9320,0x9336,0x92F8,/* 0xF0-0xF7 */ -+ 0x9333,0x932F,0x9322,0x92FC,0x932B,0x9304,0x931A,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C0[256] = { -@@ -1141,28 +1135,28 @@ - 0x9310,0x9326,0x9321,0x9315,0x932E,0x9319,0x95BB,0x96A7,/* 0x40-0x47 */ - 0x96A8,0x96AA,0x96D5,0x970E,0x9711,0x9716,0x970D,0x9713,/* 0x48-0x4F */ - 0x970F,0x975B,0x975C,0x9766,0x9798,0x9830,0x9838,0x983B,/* 0x50-0x57 */ -- 0x9837,0x982D,0x9839,0x9824,0x9910,0xFA2C,0x991E,0x991B,/* 0x58-0x5F */ -- 0x9921,0x991A,0x99ED,0x99E2,0xF91A,0x9AB8,0x9ABC,0x9AFB,/* 0x60-0x67 */ -+ 0x9837,0x982D,0x9839,0x9824,0x9910,0x9928,0x991E,0x991B,/* 0x58-0x5F */ -+ 0x9921,0x991A,0x99ED,0x99E2,0x99F1,0x9AB8,0x9ABC,0x9AFB,/* 0x60-0x67 */ - 0x9AED,0x9B28,0x9B91,0x9D15,0x9D23,0x9D26,0x9D28,0x9D12,/* 0x68-0x6F */ -- 0x9D1B,0x9ED8,0x9ED4,0xF9C4,0xF908,0x512A,0x511F,0x5121,/* 0x70-0x77 */ -- 0x5132,0xF97F,0x568E,0x5680,0x5690,0x5685,0x5687,0x0000,/* 0x78-0x7F */ -+ 0x9D1B,0x9ED8,0x9ED4,0x9F8D,0x9F9C,0x512A,0x511F,0x5121,/* 0x70-0x77 */ -+ 0x5132,0x52F5,0x568E,0x5680,0x5690,0x5685,0x5687,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x568F,0x58D5,0x58D3,0x58D1,0x58CE,0x5B30,0x5B2A,/* 0xA0-0xA7 */ -- 0x5B24,0x5B7A,0x5C37,0x5C68,0x5DBC,0xF9AB,0x5DBD,0x5DB8,/* 0xA8-0xAF */ -+ 0x5B24,0x5B7A,0x5C37,0x5C68,0x5DBC,0x5DBA,0x5DBD,0x5DB8,/* 0xA8-0xAF */ - 0x5E6B,0x5F4C,0x5FBD,0x61C9,0x61C2,0x61C7,0x61E6,0x61CB,/* 0xB0-0xB7 */ - 0x6232,0x6234,0x64CE,0x64CA,0x64D8,0x64E0,0x64F0,0x64E6,/* 0xB8-0xBF */ - 0x64EC,0x64F1,0x64E2,0x64ED,0x6582,0x6583,0x66D9,0x66D6,/* 0xC0-0xC7 */ - 0x6A80,0x6A94,0x6A84,0x6AA2,0x6A9C,0x6ADB,0x6AA3,0x6A7E,/* 0xC8-0xCF */ -- 0x6A97,0x6A90,0x6AA0,0x6B5C,0xF9A5,0x6BDA,0x6C08,0x6FD8,/* 0xD0-0xD7 */ -- 0x6FF1,0x6FDF,0x6FE0,0x6FDB,0x6FE4,0xF922,0x6FEF,0x6F80,/* 0xD8-0xDF */ -+ 0x6A97,0x6A90,0x6AA0,0x6B5C,0x6BAE,0x6BDA,0x6C08,0x6FD8,/* 0xD0-0xD7 */ -+ 0x6FF1,0x6FDF,0x6FE0,0x6FDB,0x6FE4,0x6FEB,0x6FEF,0x6F80,/* 0xD8-0xDF */ - 0x6FEC,0x6FE1,0x6FE9,0x6FD5,0x6FEE,0x6FF0,0x71E7,0x71DF,/* 0xE0-0xE7 */ - 0x71EE,0x71E6,0x71E5,0x71ED,0x71EC,0x71F4,0x71E0,0x7235,/* 0xE8-0xEF */ - 0x7246,0x7370,0x7372,0x74A9,0x74B0,0x74A6,0x74A8,0x7646,/* 0xF0-0xF7 */ -- 0xF9C1,0x764C,0x76EA,0x77B3,0x77AA,0x77B0,0x77AC,0x0000,/* 0xF8-0xFF */ -+ 0x7642,0x764C,0x76EA,0x77B3,0x77AA,0x77B0,0x77AC,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C1[256] = { -@@ -1177,11 +1171,11 @@ - 0x77A7,0x77AD,0x77EF,0x78F7,0x78FA,0x78F4,0x78EF,0x7901,/* 0x40-0x47 */ - 0x79A7,0x79AA,0x7A57,0x7ABF,0x7C07,0x7C0D,0x7BFE,0x7BF7,/* 0x48-0x4F */ - 0x7C0C,0x7BE0,0x7CE0,0x7CDC,0x7CDE,0x7CE2,0x7CDF,0x7CD9,/* 0x50-0x57 */ -- 0x7CDD,0x7E2E,0x7E3E,0x7E46,0xF950,0x7E32,0x7E43,0x7E2B,/* 0x58-0x5F */ -+ 0x7CDD,0x7E2E,0x7E3E,0x7E46,0x7E37,0x7E32,0x7E43,0x7E2B,/* 0x58-0x5F */ - 0x7E3D,0x7E31,0x7E45,0x7E41,0x7E34,0x7E39,0x7E48,0x7E35,/* 0x60-0x67 */ - 0x7E3F,0x7E2F,0x7F44,0x7FF3,0x7FFC,0x8071,0x8072,0x8070,/* 0x68-0x6F */ -- 0xF997,0x8073,0x81C6,0x81C3,0x81BA,0x81C2,0x81C0,0x81BF,/* 0x70-0x77 */ -- 0x81BD,0x81C9,0x81BE,0xF9F6,0x8209,0x8271,0x85AA,0x0000,/* 0x78-0x7F */ -+ 0x806F,0x8073,0x81C6,0x81C3,0x81BA,0x81C2,0x81C0,0x81BF,/* 0x70-0x77 */ -+ 0x81BD,0x81C9,0x81BE,0x81E8,0x8209,0x8271,0x85AA,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ -@@ -1189,15 +1183,15 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x8584,0x857E,0x859C,0x8591,0x8594,0x85AF,0x859B,/* 0xA0-0xA7 */ - 0x8587,0x85A8,0x858A,0x8667,0x87C0,0x87D1,0x87B3,0x87D2,/* 0xA8-0xAF */ -- 0x87C6,0x87AB,0x87BB,0xF911,0x87C8,0x87CB,0x893B,0x8936,/* 0xB0-0xB7 */ -+ 0x87C6,0x87AB,0x87BB,0x87BA,0x87C8,0x87CB,0x893B,0x8936,/* 0xB0-0xB7 */ - 0x8944,0x8938,0x893D,0x89AC,0x8B0E,0x8B17,0x8B19,0x8B1B,/* 0xB8-0xBF */ - 0x8B0A,0x8B20,0x8B1D,0x8B04,0x8B10,0x8C41,0x8C3F,0x8C73,/* 0xC0-0xC7 */ - 0x8CFA,0x8CFD,0x8CFC,0x8CF8,0x8CFB,0x8DA8,0x8E49,0x8E4B,/* 0xC8-0xCF */ - 0x8E48,0x8E4A,0x8F44,0x8F3E,0x8F42,0x8F45,0x8F3F,0x907F,/* 0xD0-0xD7 */ - 0x907D,0x9084,0x9081,0x9082,0x9080,0x9139,0x91A3,0x919E,/* 0xD8-0xDF */ -- 0x919C,0x934D,0x9382,0x9328,0x9375,0xF99B,0x9365,0x934B,/* 0xE0-0xE7 */ -+ 0x919C,0x934D,0x9382,0x9328,0x9375,0x934A,0x9365,0x934B,/* 0xE0-0xE7 */ - 0x9318,0x937E,0x936C,0x935B,0x9370,0x935A,0x9354,0x95CA,/* 0xE8-0xEF */ -- 0x95CB,0x95CC,0x95C8,0x95C6,0x96B1,0xF9B8,0x96D6,0x971C,/* 0xF0-0xF7 */ -+ 0x95CB,0x95CC,0x95C8,0x95C6,0x96B1,0x96B8,0x96D6,0x971C,/* 0xF0-0xF7 */ - 0x971E,0x97A0,0x97D3,0x9846,0x98B6,0x9935,0x9A01,0x0000,/* 0xF8-0xFF */ - }; - -@@ -1212,28 +1206,28 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x99FF,0x9BAE,0x9BAB,0x9BAA,0x9BAD,0x9D3B,0x9D3F,0x9E8B,/* 0x40-0x47 */ - 0x9ECF,0x9EDE,0x9EDC,0x9EDD,0x9EDB,0x9F3E,0x9F4B,0x53E2,/* 0x48-0x4F */ -- 0x5695,0x56AE,0x58D9,0xF94A,0x5B38,0x5F5D,0x61E3,0x6233,/* 0x50-0x57 */ -+ 0x5695,0x56AE,0x58D9,0x58D8,0x5B38,0x5F5D,0x61E3,0x6233,/* 0x50-0x57 */ - 0x64F4,0x64F2,0x64FE,0x6506,0x64FA,0x64FB,0x64F7,0x65B7,/* 0x58-0x5F */ - 0x66DC,0x6726,0x6AB3,0x6AAC,0x6AC3,0x6ABB,0x6AB8,0x6AC2,/* 0x60-0x67 */ -- 0x6AAE,0x6AAF,0x6B5F,0x6B78,0x6BAF,0x7009,0x700B,0xF984,/* 0x68-0x6F */ -+ 0x6AAE,0x6AAF,0x6B5F,0x6B78,0x6BAF,0x7009,0x700B,0x6FFE,/* 0x68-0x6F */ - 0x7006,0x6FFA,0x7011,0x700F,0x71FB,0x71FC,0x71FE,0x71F8,/* 0x70-0x77 */ -- 0x7377,0xF9A7,0x74A7,0x74BF,0x7515,0x7656,0x7658,0x0000,/* 0x78-0x7F */ -+ 0x7377,0x7375,0x74A7,0x74BF,0x7515,0x7656,0x7658,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x7652,0x77BD,0x77BF,0x77BB,0x77BC,0x790E,0xF9B6,/* 0xA0-0xA7 */ -+ 0x0000,0x7652,0x77BD,0x77BF,0x77BB,0x77BC,0x790E,0x79AE,/* 0xA0-0xA7 */ - 0x7A61,0x7A62,0x7A60,0x7AC4,0x7AC5,0x7C2B,0x7C27,0x7C2A,/* 0xA8-0xAF */ -- 0x7C1E,0x7C23,0x7C21,0xF97B,0x7E54,0x7E55,0x7E5E,0x7E5A,/* 0xB0-0xB7 */ -+ 0x7C1E,0x7C23,0x7C21,0x7CE7,0x7E54,0x7E55,0x7E5E,0x7E5A,/* 0xB0-0xB7 */ - 0x7E61,0x7E52,0x7E59,0x7F48,0x7FF9,0x7FFB,0x8077,0x8076,/* 0xB8-0xBF */ -- 0x81CD,0x81CF,0x820A,0x85CF,0x85A9,0xF923,0x85D0,0x85C9,/* 0xC0-0xC7 */ -+ 0x81CD,0x81CF,0x820A,0x85CF,0x85A9,0x85CD,0x85D0,0x85C9,/* 0xC0-0xC7 */ - 0x85B0,0x85BA,0x85B9,0x85A6,0x87EF,0x87EC,0x87F2,0x87E0,/* 0xC8-0xCF */ - 0x8986,0x89B2,0x89F4,0x8B28,0x8B39,0x8B2C,0x8B2B,0x8C50,/* 0xD0-0xD7 */ - 0x8D05,0x8E59,0x8E63,0x8E66,0x8E64,0x8E5F,0x8E55,0x8EC0,/* 0xD8-0xDF */ - 0x8F49,0x8F4D,0x9087,0x9083,0x9088,0x91AB,0x91AC,0x91D0,/* 0xE0-0xE7 */ - 0x9394,0x938A,0x9396,0x93A2,0x93B3,0x93AE,0x93AC,0x93B0,/* 0xE8-0xEF */ -- 0x9398,0x939A,0x9397,0x95D4,0x95D6,0x95D0,0x95D5,0xF9EA,/* 0xF0-0xF7 */ -+ 0x9398,0x939A,0x9397,0x95D4,0x95D6,0x95D0,0x95D5,0x96E2,/* 0xF0-0xF7 */ - 0x96DC,0x96D9,0x96DB,0x96DE,0x9724,0x97A3,0x97A6,0x0000,/* 0xF8-0xFF */ - }; - -@@ -1250,9 +1244,9 @@ - 0x993E,0x993F,0x993D,0x992E,0x99A5,0x9A0E,0x9AC1,0x9B03,/* 0x48-0x4F */ - 0x9B06,0x9B4F,0x9B4E,0x9B4D,0x9BCA,0x9BC9,0x9BFD,0x9BC8,/* 0x50-0x57 */ - 0x9BC0,0x9D51,0x9D5D,0x9D60,0x9EE0,0x9F15,0x9F2C,0x5133,/* 0x58-0x5F */ -- 0x56A5,0x58DE,0xF942,0x58E2,0x5BF5,0x9F90,0xF982,0x61F2,/* 0x60-0x67 */ -- 0x61F7,0xF90D,0x61F5,0x6500,0x650F,0x66E0,0x66DD,0x6AE5,/* 0x68-0x6F */ -- 0x6ADD,0x6ADA,0xF931,0x701B,0x701F,0x7028,0x701A,0x701D,/* 0x70-0x77 */ -+ 0x56A5,0x58DE,0x58DF,0x58E2,0x5BF5,0x9F90,0x5EEC,0x61F2,/* 0x60-0x67 */ -+ 0x61F7,0x61F6,0x61F5,0x6500,0x650F,0x66E0,0x66DD,0x6AE5,/* 0x68-0x6F */ -+ 0x6ADD,0x6ADA,0x6AD3,0x701B,0x701F,0x7028,0x701A,0x701D,/* 0x70-0x77 */ - 0x7015,0x7018,0x7206,0x720D,0x7258,0x72A2,0x7378,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ -@@ -1260,17 +1254,17 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x737A,0x74BD,0x74CA,0x74E3,0x7587,0x7586,0x765F,/* 0xA0-0xA7 */ -- 0x7661,0x77C7,0x7919,0x79B1,0x7A6B,0x7A69,0xF9A6,0x7C3F,/* 0xA8-0xAF */ -+ 0x7661,0x77C7,0x7919,0x79B1,0x7A6B,0x7A69,0x7C3E,0x7C3F,/* 0xA8-0xAF */ - 0x7C38,0x7C3D,0x7C37,0x7C40,0x7E6B,0x7E6D,0x7E79,0x7E69,/* 0xB0-0xB7 */ -- 0x7E6A,0xF90F,0x7E73,0x7FB6,0x7FB9,0x7FB8,0xF926,0x85E9,/* 0xB8-0xBF */ -+ 0x7E6A,0x7F85,0x7E73,0x7FB6,0x7FB9,0x7FB8,0x81D8,0x85E9,/* 0xB8-0xBF */ - 0x85DD,0x85EA,0x85D5,0x85E4,0x85E5,0x85F7,0x87FB,0x8805,/* 0xC0-0xC7 */ - 0x880D,0x87F9,0x87FE,0x8960,0x895F,0x8956,0x895E,0x8B41,/* 0xC8-0xCF */ -- 0x8B5C,0xF9FC,0x8B49,0x8B5A,0x8B4E,0x8B4F,0x8B46,0x8B59,/* 0xD0-0xD7 */ -+ 0x8B5C,0x8B58,0x8B49,0x8B5A,0x8B4E,0x8B4F,0x8B46,0x8B59,/* 0xD0-0xD7 */ - 0x8D08,0x8D0A,0x8E7C,0x8E72,0x8E87,0x8E76,0x8E6C,0x8E7A,/* 0xD8-0xDF */ - 0x8E74,0x8F54,0x8F4E,0x8FAD,0x908A,0x908B,0x91B1,0x91AE,/* 0xE0-0xE7 */ - 0x93E1,0x93D1,0x93DF,0x93C3,0x93C8,0x93DC,0x93DD,0x93D6,/* 0xE8-0xEF */ - 0x93E2,0x93CD,0x93D8,0x93E4,0x93D7,0x93E8,0x95DC,0x96B4,/* 0xF0-0xF7 */ -- 0x96E3,0x972A,0x9727,0x9761,0x97DC,0x97FB,0xF9D0,0x0000,/* 0xF8-0xFF */ -+ 0x96E3,0x972A,0x9727,0x9761,0x97DC,0x97FB,0x985E,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C4[256] = { -@@ -1284,11 +1278,11 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x9858,0x985B,0x98BC,0x9945,0x9949,0x9A16,0x9A19,0x9B0D,/* 0x40-0x47 */ - 0x9BE8,0x9BE7,0x9BD6,0x9BDB,0x9D89,0x9D61,0x9D72,0x9D6A,/* 0x48-0x4F */ -- 0x9D6C,0x9E92,0xF988,0x9E93,0x9EB4,0x52F8,0x56A8,0x56B7,/* 0x50-0x57 */ -+ 0x9D6C,0x9E92,0x9E97,0x9E93,0x9EB4,0x52F8,0x56A8,0x56B7,/* 0x50-0x57 */ - 0x56B6,0x56B4,0x56BC,0x58E4,0x5B40,0x5B43,0x5B7D,0x5BF6,/* 0x58-0x5F */ - 0x5DC9,0x61F8,0x61FA,0x6518,0x6514,0x6519,0x66E6,0x6727,/* 0x60-0x67 */ -- 0x6AEC,0x703E,0x7030,0x7032,0xF932,0x737B,0x74CF,0x7662,/* 0x68-0x6F */ -- 0x7665,0x7926,0xF985,0x792C,0x792B,0x7AC7,0x7AF6,0x7C4C,/* 0x70-0x77 */ -+ 0x6AEC,0x703E,0x7030,0x7032,0x7210,0x737B,0x74CF,0x7662,/* 0x68-0x6F */ -+ 0x7665,0x7926,0x792A,0x792C,0x792B,0x7AC7,0x7AF6,0x7C4C,/* 0x70-0x77 */ - 0x7C43,0x7C4D,0x7CEF,0x7CF0,0x8FAE,0x7E7D,0x7E7C,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ -@@ -1296,17 +1290,17 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x7E82,0x7F4C,0x8000,0x81DA,0x8266,0x85FB,0x85F9,/* 0xA0-0xA7 */ -- 0x8611,0xF9F0,0xF935,0x860B,0x8607,0x860A,0x8814,0x8815,/* 0xA8-0xAF */ -- 0xF924,0x89BA,0x89F8,0x8B70,0x8B6C,0x8B66,0x8B6F,0x8B5F,/* 0xB0-0xB7 */ -- 0x8B6B,0x8D0F,0x8D0D,0x8E89,0x8E81,0x8E85,0x8E82,0xF9B7,/* 0xB8-0xBF */ -+ 0x8611,0x85FA,0x8606,0x860B,0x8607,0x860A,0x8814,0x8815,/* 0xA8-0xAF */ -+ 0x8964,0x89BA,0x89F8,0x8B70,0x8B6C,0x8B66,0x8B6F,0x8B5F,/* 0xB0-0xB7 */ -+ 0x8B6B,0x8D0F,0x8D0D,0x8E89,0x8E81,0x8E85,0x8E82,0x91B4,/* 0xB8-0xBF */ - 0x91CB,0x9418,0x9403,0x93FD,0x95E1,0x9730,0x98C4,0x9952,/* 0xC0-0xC7 */ - 0x9951,0x99A8,0x9A2B,0x9A30,0x9A37,0x9A35,0x9C13,0x9C0D,/* 0xC8-0xCF */ - 0x9E79,0x9EB5,0x9EE8,0x9F2F,0x9F5F,0x9F63,0x9F61,0x5137,/* 0xD0-0xD7 */ - 0x5138,0x56C1,0x56C0,0x56C2,0x5914,0x5C6C,0x5DCD,0x61FC,/* 0xD8-0xDF */ -- 0x61FE,0x651D,0x651C,0x6595,0x66E9,0x6AFB,0xF91D,0x6AFA,/* 0xE0-0xE7 */ -- 0x6BB2,0x704C,0xF91E,0x72A7,0x74D6,0x74D4,0xF90E,0x77D3,/* 0xE8-0xEF */ -- 0x7C50,0x7E8F,0x7E8C,0x7FBC,0x8617,0xF91F,0x861A,0x8823,/* 0xF0-0xF7 */ -- 0x8822,0x8821,0xF927,0x896A,0x896C,0x89BD,0x8B74,0x0000,/* 0xF8-0xFF */ -+ 0x61FE,0x651D,0x651C,0x6595,0x66E9,0x6AFB,0x6B04,0x6AFA,/* 0xE0-0xE7 */ -+ 0x6BB2,0x704C,0x721B,0x72A7,0x74D6,0x74D4,0x7669,0x77D3,/* 0xE8-0xEF */ -+ 0x7C50,0x7E8F,0x7E8C,0x7FBC,0x8617,0x862D,0x861A,0x8823,/* 0xF0-0xF7 */ -+ 0x8822,0x8821,0x881F,0x896A,0x896C,0x89BD,0x8B74,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C5[256] = { -@@ -1320,9 +1314,9 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x8B77,0x8B7D,0x8D13,0x8E8A,0x8E8D,0x8E8B,0x8F5F,0x8FAF,/* 0x40-0x47 */ - 0x91BA,0x942E,0x9433,0x9435,0x943A,0x9438,0x9432,0x942B,/* 0x48-0x4F */ -- 0x95E2,0x9738,0x9739,0xF938,0x97FF,0x9867,0x9865,0x9957,/* 0x50-0x57 */ -+ 0x95E2,0x9738,0x9739,0x9732,0x97FF,0x9867,0x9865,0x9957,/* 0x50-0x57 */ - 0x9A45,0x9A43,0x9A40,0x9A3E,0x9ACF,0x9B54,0x9B51,0x9C2D,/* 0x58-0x5F */ -- 0x9C25,0x9DAF,0xFA2D,0x9DC2,0x9DB8,0x9E9D,0x9EEF,0x9F19,/* 0x60-0x67 */ -+ 0x9C25,0x9DAF,0x9DB4,0x9DC2,0x9DB8,0x9E9D,0x9EEF,0x9F19,/* 0x60-0x67 */ - 0x9F5C,0x9F66,0x9F67,0x513C,0x513B,0x56C8,0x56CA,0x56C9,/* 0x68-0x6F */ - 0x5B7F,0x5DD4,0x5DD2,0x5F4E,0x61FF,0x6524,0x6B0A,0x6B61,/* 0x70-0x77 */ - 0x7051,0x7058,0x7380,0x74E4,0x758A,0x766E,0x766C,0x0000,/* 0x78-0x7F */ -@@ -1331,16 +1325,16 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x79B3,0xF944,0x7C5F,0xF945,0x807D,0x81DF,0x8972,/* 0xA0-0xA7 */ -- 0x896F,0x89FC,0xF95A,0x8D16,0x8D17,0x8E91,0x8E93,0x8F61,/* 0xA8-0xAF */ -+ 0x0000,0x79B3,0x7C60,0x7C5F,0x807E,0x807D,0x81DF,0x8972,/* 0xA0-0xA7 */ -+ 0x896F,0x89FC,0x8B80,0x8D16,0x8D17,0x8E91,0x8E93,0x8F61,/* 0xA8-0xAF */ - 0x9148,0x9444,0x9451,0x9452,0x973D,0x973E,0x97C3,0x97C1,/* 0xB0-0xB7 */ - 0x986B,0x9955,0x9A55,0x9A4D,0x9AD2,0x9B1A,0x9C49,0x9C31,/* 0xB8-0xBF */ - 0x9C3E,0x9C3B,0x9DD3,0x9DD7,0x9F34,0x9F6C,0x9F6A,0x9F94,/* 0xC0-0xC7 */ -- 0x56CC,0x5DD6,0xF990,0x6523,0x652B,0x652A,0x66EC,0x6B10,/* 0xC8-0xCF */ -+ 0x56CC,0x5DD6,0x6200,0x6523,0x652B,0x652A,0x66EC,0x6B10,/* 0xC8-0xCF */ - 0x74DA,0x7ACA,0x7C64,0x7C63,0x7C65,0x7E93,0x7E96,0x7E94,/* 0xD0-0xD7 */ -- 0x81E2,0x8638,0xF910,0x8831,0x8B8A,0x9090,0xF913,0x9463,/* 0xD8-0xDF */ -+ 0x81E2,0x8638,0x863F,0x8831,0x8B8A,0x9090,0x908F,0x9463,/* 0xD8-0xDF */ - 0x9460,0x9464,0x9768,0x986F,0x995C,0x9A5A,0x9A5B,0x9A57,/* 0xE0-0xE7 */ -- 0x9AD3,0x9AD4,0x9AD1,0x9C54,0xF9F2,0x9C56,0x9DE5,0xF9F3,/* 0xE8-0xEF */ -+ 0x9AD3,0x9AD4,0x9AD1,0x9C54,0x9C57,0x9C56,0x9DE5,0x9E9F,/* 0xE8-0xEF */ - 0x9EF4,0x56D1,0x58E9,0x652C,0x705E,0x7671,0x7672,0x77D7,/* 0xF0-0xF7 */ - 0x7F50,0x7F88,0x8836,0x8839,0x8862,0x8B93,0x8B92,0x0000,/* 0xF8-0xFF */ - }; -@@ -1354,14 +1348,14 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x8B96,0x8277,0x8D1B,0x91C0,0x946A,0x9742,0xF9B3,0x9744,/* 0x40-0x47 */ -- 0x97C6,0x9870,0x9A5F,0x9B22,0x9B58,0x9C5F,0x9DF9,0xF93A,/* 0x48-0x4F */ -+ 0x8B96,0x8277,0x8D1B,0x91C0,0x946A,0x9742,0x9748,0x9744,/* 0x40-0x47 */ -+ 0x97C6,0x9870,0x9A5F,0x9B22,0x9B58,0x9C5F,0x9DF9,0x9DFA,/* 0x48-0x4F */ - 0x9E7C,0x9E7D,0x9F07,0x9F77,0x9F72,0x5EF3,0x6B16,0x7063,/* 0x50-0x57 */ - 0x7C6C,0x7C6E,0x883B,0x89C0,0x8EA1,0x91C1,0x9472,0x9470,/* 0x58-0x5F */ - 0x9871,0x995E,0x9AD6,0x9B23,0x9ECC,0x7064,0x77DA,0x8B9A,/* 0x60-0x67 */ - 0x9477,0x97C9,0x9A62,0x9A65,0x7E9C,0x8B9C,0x8EAA,0x91C5,/* 0x68-0x6F */ - 0x947D,0x947E,0x947C,0x9C77,0x9C78,0x9EF7,0x8C54,0x947F,/* 0x70-0x77 */ -- 0x9E1A,0x7228,0xF987,0x9B31,0x9E1B,0xF920,0x7C72,0x0000,/* 0x78-0x7F */ -+ 0x9E1A,0x7228,0x9A6A,0x9B31,0x9E1B,0x9E1E,0x7C72,0x0000,/* 0x78-0x7F */ - }; - - static wchar_t c2u_C9[256] = { -@@ -1468,7 +1462,7 @@ - 0x533C,0x5392,0x5394,0x5487,0x547F,0x5481,0x5491,0x5482,/* 0xD8-0xDF */ - 0x5488,0x546B,0x547A,0x547E,0x5465,0x546C,0x5474,0x5466,/* 0xE0-0xE7 */ - 0x548D,0x546F,0x5461,0x5460,0x5498,0x5463,0x5467,0x5464,/* 0xE8-0xEF */ -- 0x56F7,0xF9A9,0x576F,0x5772,0x576D,0x576B,0x5771,0x5770,/* 0xF0-0xF7 */ -+ 0x56F7,0x56F9,0x576F,0x5772,0x576D,0x576B,0x5771,0x5770,/* 0xF0-0xF7 */ - 0x5776,0x5780,0x5775,0x577B,0x5773,0x5774,0x5762,0x0000,/* 0xF8-0xFF */ - }; - -@@ -1496,12 +1490,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x6034,0x600A,0x6017,0x6033,0x601A,0x601E,0x602C,/* 0xA0-0xA7 */ - 0x6022,0x600D,0x6010,0x602E,0x6013,0x6011,0x600C,0x6009,/* 0xA8-0xAF */ -- 0xF9AC,0x6214,0x623D,0x62AD,0x62B4,0x62D1,0x62BE,0x62AA,/* 0xB0-0xB7 */ -+ 0x601C,0x6214,0x623D,0x62AD,0x62B4,0x62D1,0x62BE,0x62AA,/* 0xB0-0xB7 */ - 0x62B6,0x62CA,0x62AE,0x62B3,0x62AF,0x62BB,0x62A9,0x62B0,/* 0xB8-0xBF */ - 0x62B8,0x653D,0x65A8,0x65BB,0x6609,0x65FC,0x6604,0x6612,/* 0xC0-0xC7 */ - 0x6608,0x65FB,0x6603,0x660B,0x660D,0x6605,0x65FD,0x6611,/* 0xC8-0xCF */ - 0x6610,0x66F6,0x670A,0x6785,0x676C,0x678E,0x6792,0x6776,/* 0xD0-0xD7 */ -- 0xF9C8,0x6798,0x6786,0x6784,0x6774,0x678D,0x678C,0x677A,/* 0xD8-0xDF */ -+ 0x677B,0x6798,0x6786,0x6784,0x6774,0x678D,0x678C,0x677A,/* 0xD8-0xDF */ - 0x679F,0x6791,0x6799,0x6783,0x677D,0x6781,0x6778,0x6779,/* 0xE0-0xE7 */ - 0x6794,0x6B25,0x6B80,0x6B7E,0x6BDE,0x6C1D,0x6C93,0x6CEC,/* 0xE8-0xEF */ - 0x6CEB,0x6CEE,0x6CD9,0x6CB6,0x6CD4,0x6CAD,0x6CE7,0x6CB7,/* 0xF0-0xF7 */ -@@ -1572,7 +1566,7 @@ - 0x5E9B,0x5EA3,0x5EA5,0x5F07,0x5F2E,0x5F56,0x5F86,0x6037,/* 0xB8-0xBF */ - 0x6039,0x6054,0x6072,0x605E,0x6045,0x6053,0x6047,0x6049,/* 0xC0-0xC7 */ - 0x605B,0x604C,0x6040,0x6042,0x605F,0x6024,0x6044,0x6058,/* 0xC8-0xCF */ -- 0x6066,0x606E,0x6242,0x6243,0xF95B,0x630D,0x630B,0x62F5,/* 0xD0-0xD7 */ -+ 0x6066,0x606E,0x6242,0x6243,0x62CF,0x630D,0x630B,0x62F5,/* 0xD0-0xD7 */ - 0x630E,0x6303,0x62EB,0x62F9,0x630F,0x630C,0x62F8,0x62F6,/* 0xD8-0xDF */ - 0x6300,0x6313,0x6314,0x62FA,0x6315,0x62FB,0x62F0,0x6541,/* 0xE0-0xE7 */ - 0x6543,0x65AA,0x65BF,0x6636,0x6621,0x6632,0x6635,0x661C,/* 0xE8-0xEF */ -@@ -2027,7 +2021,7 @@ - 0x823C,0x823D,0x823F,0x8275,0x833B,0x83CF,0x83F9,0x8423,/* 0x58-0x5F */ - 0x83C0,0x83E8,0x8412,0x83E7,0x83E4,0x83FC,0x83F6,0x8410,/* 0x60-0x67 */ - 0x83C6,0x83C8,0x83EB,0x83E3,0x83BF,0x8401,0x83DD,0x83E5,/* 0x68-0x6F */ -- 0x83D8,0x83FF,0x83E1,0x83CB,0x83CE,0x83D6,0x83F5,0xF93E,/* 0x70-0x77 */ -+ 0x83D8,0x83FF,0x83E1,0x83CB,0x83CE,0x83D6,0x83F5,0x83C9,/* 0x70-0x77 */ - 0x8409,0x840F,0x83DE,0x8411,0x8406,0x83C2,0x83F3,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ -@@ -2430,7 +2424,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x7362,0x7487,0xF994,0x748A,0x7486,0x7481,0x747D,/* 0xA0-0xA7 */ -+ 0x0000,0x7362,0x7487,0x7489,0x748A,0x7486,0x7481,0x747D,/* 0xA0-0xA7 */ - 0x7485,0x7488,0x747C,0x7479,0x7508,0x7507,0x757E,0x7625,/* 0xA8-0xAF */ - 0x761E,0x7619,0x761D,0x761C,0x7623,0x761A,0x7628,0x761B,/* 0xB0-0xB7 */ - 0x769C,0x769D,0x769E,0x769B,0x778D,0x778F,0x7789,0x7788,/* 0xB8-0xBF */ -@@ -2457,7 +2451,7 @@ - 0x8252,0x8250,0x824E,0x8251,0x8524,0x853B,0x850F,0x8500,/* 0x48-0x4F */ - 0x8529,0x850E,0x8509,0x850D,0x851F,0x850A,0x8527,0x851C,/* 0x50-0x57 */ - 0x84FB,0x852B,0x84FA,0x8508,0x850C,0x84F4,0x852A,0x84F2,/* 0x58-0x5F */ -- 0x8515,0x84F7,0x84EB,0x84F3,0xF9C2,0x8512,0x84EA,0x84E9,/* 0x60-0x67 */ -+ 0x8515,0x84F7,0x84EB,0x84F3,0x84FC,0x8512,0x84EA,0x84E9,/* 0x60-0x67 */ - 0x8516,0x84FE,0x8528,0x851D,0x852E,0x8502,0x84FD,0x851E,/* 0x68-0x6F */ - 0x84F6,0x8531,0x8526,0x84E7,0x84E8,0x84F0,0x84EF,0x84F9,/* 0x70-0x77 */ - 0x8518,0x8520,0x8530,0x850B,0x8519,0x852F,0x8662,0x0000,/* 0x78-0x7F */ -@@ -2513,7 +2507,7 @@ - 0x9B70,0x9B68,0x9B64,0x9B6C,0x9CFC,0x9CFA,0x9CFD,0x9CFF,/* 0xE0-0xE7 */ - 0x9CF7,0x9D07,0x9D00,0x9CF9,0x9CFB,0x9D08,0x9D05,0x9D04,/* 0xE8-0xEF */ - 0x9E83,0x9ED3,0x9F0F,0x9F10,0x511C,0x5113,0x5117,0x511A,/* 0xF0-0xF7 */ -- 0x5111,0xFA15,0x5334,0x53E1,0x5670,0x5660,0x566E,0x0000,/* 0xF8-0xFF */ -+ 0x5111,0x51DE,0x5334,0x53E1,0x5670,0x5660,0x566E,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_E9[256] = { -@@ -2683,7 +2677,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x77B4,0x77B1,0x77A8,0x77F0,0x78F3,0x78FD,0x7902,/* 0xA0-0xA7 */ -- 0xF964,0x78FC,0x78F2,0x7905,0x78F9,0x78FE,0x7904,0x79AB,/* 0xA8-0xAF */ -+ 0x78FB,0x78FC,0x78F2,0x7905,0x78F9,0x78FE,0x7904,0x79AB,/* 0xA8-0xAF */ - 0x79A8,0x7A5C,0x7A5B,0x7A56,0x7A58,0x7A54,0x7A5A,0x7ABE,/* 0xB0-0xB7 */ - 0x7AC0,0x7AC1,0x7C05,0x7C0F,0x7BF2,0x7C00,0x7BFF,0x7BFB,/* 0xB8-0xBF */ - 0x7C0E,0x7BF4,0x7C0B,0x7BF3,0x7C02,0x7C09,0x7C03,0x7C01,/* 0xC0-0xC7 */ -@@ -3033,7 +3027,7 @@ - 0x8635,0x8633,0x862C,0x8632,0x8636,0x882C,0x8828,0x8826,/* 0x48-0x4F */ - 0x882A,0x8825,0x8971,0x89BF,0x89BE,0x89FB,0x8B7E,0x8B84,/* 0x50-0x57 */ - 0x8B82,0x8B86,0x8B85,0x8B7F,0x8D15,0x8E95,0x8E94,0x8E9A,/* 0x58-0x5F */ -- 0x8E92,0x8E90,0x8E96,0x8E97,0x8F60,0xF98D,0x9147,0x944C,/* 0x60-0x67 */ -+ 0x8E92,0x8E90,0x8E96,0x8E97,0x8F60,0x8F62,0x9147,0x944C,/* 0x60-0x67 */ - 0x9450,0x944A,0x944B,0x944F,0x9447,0x9445,0x9448,0x9449,/* 0x68-0x6F */ - 0x9446,0x973F,0x97E3,0x986A,0x9869,0x98CB,0x9954,0x995B,/* 0x70-0x77 */ - 0x9A4E,0x9A53,0x9A54,0x9A4C,0x9A4F,0x9A48,0x9A4A,0x0000,/* 0x78-0x7F */ -@@ -3125,7 +3119,7 @@ - 0x2560,0x256C,0x2563,0x255A,0x2569,0x255D,0x2552,0x2564,/* 0xE0-0xE7 */ - 0x2555,0x255E,0x256A,0x2561,0x2558,0x2567,0x255B,0x2553,/* 0xE8-0xEF */ - 0x2565,0x2556,0x255F,0x256B,0x2562,0x2559,0x2568,0x255C,/* 0xF0-0xF7 */ -- 0x2551,0x2550,0x0000,0x0000,0x0000,0x0000,0x2593,0x0000,/* 0xF8-0xFF */ -+ 0x2551,0x2550,0x256D,0x256E,0x2570,0x256F,0x2593,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t *page_charset2uni[256] = { -@@ -3163,6 +3157,73 @@ - c2u_F8, c2u_F9, NULL, NULL, NULL, NULL, NULL, NULL, - }; - -+ -+static unsigned char u2c_00[512] = { -+ 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, /* 0x00-0x03 */ -+ 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, /* 0x04-0x07 */ -+ 0x00, 0x08, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, /* 0x08-0x0B */ -+ 0x00, 0x0C, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x0F, /* 0x0C-0x0F */ -+ 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, /* 0x10-0x13 */ -+ 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, /* 0x14-0x17 */ -+ 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, /* 0x18-0x1B */ -+ 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, /* 0x1C-0x1F */ -+ 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, /* 0x20-0x23 */ -+ 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, /* 0x24-0x27 */ -+ 0x00, 0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, /* 0x28-0x2B */ -+ 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2E, 0x00, 0x2F, /* 0x2C-0x2F */ -+ 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, /* 0x30-0x33 */ -+ 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, /* 0x34-0x37 */ -+ 0x00, 0x38, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3B, /* 0x38-0x3B */ -+ 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x3F, /* 0x3C-0x3F */ -+ 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, /* 0x40-0x43 */ -+ 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, /* 0x44-0x47 */ -+ 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, /* 0x48-0x4B */ -+ 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, /* 0x4C-0x4F */ -+ 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, /* 0x50-0x53 */ -+ 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, /* 0x54-0x57 */ -+ 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, /* 0x58-0x5B */ -+ 0x00, 0x5C, 0x00, 0x5D, 0x00, 0x5E, 0x00, 0x5F, /* 0x5C-0x5F */ -+ 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, /* 0x60-0x63 */ -+ 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, /* 0x64-0x67 */ -+ 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00, 0x6B, /* 0x68-0x6B */ -+ 0x00, 0x6C, 0x00, 0x6D, 0x00, 0x6E, 0x00, 0x6F, /* 0x6C-0x6F */ -+ 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, /* 0x70-0x73 */ -+ 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, /* 0x74-0x77 */ -+ 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, /* 0x78-0x7B */ -+ 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, /* 0x7C-0x7F */ -+ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xB1, /* 0xA4-0xA7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC2, /* 0xAC-0xAF */ -+ 0xA2, 0x58, 0xA1, 0xD3, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x50, /* 0xB4-0xB7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD1, /* 0xD4-0xD7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE4-0xE7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE8-0xEB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD2, /* 0xF4-0xF7 */ -+}; -+ - static unsigned char u2c_02[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ -@@ -3224,7 +3285,7 @@ - - static unsigned char u2c_03[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ -- 0x00, 0x00, 0xA1, 0xC2, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ -@@ -3283,17 +3344,16 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x56, /* 0x10-0x13 */ -- 0xA1, 0x58, 0xA2, 0x77, 0xA1, 0xFC, 0x00, 0x00, /* 0x14-0x17 */ -+ 0xA1, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ - 0xA1, 0xA5, 0xA1, 0xA6, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ - 0xA1, 0xA7, 0xA1, 0xA8, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ -- 0x00, 0x00, 0x00, 0x00, 0xA1, 0x45, 0x00, 0x00, /* 0x20-0x23 */ -- 0xA3, 0xBB, 0xA1, 0x4C, 0xA1, 0x4B, 0xA1, 0x45, /* 0x24-0x27 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ -+ 0x00, 0x00, 0xA1, 0x4C, 0xA1, 0x4B, 0xA1, 0x45, /* 0x24-0x27 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -- 0x00, 0x00, 0x00, 0x00, 0xA1, 0xAC, 0xA1, 0xB2, /* 0x30-0x33 */ -+ 0x00, 0x00, 0x00, 0x00, 0xA1, 0xAC, 0x00, 0x00, /* 0x30-0x33 */ - 0x00, 0x00, 0xA1, 0xAB, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xB0, /* 0x38-0x3B */ -- 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC3, 0x00, 0x00, /* 0x3C-0x3F */ - }; - - static unsigned char u2c_21[512] = { -@@ -3345,8 +3405,8 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ -- 0x00, 0x00, 0xA2, 0x41, 0xA2, 0x42, 0x00, 0x00, /* 0x14-0x17 */ -- 0xA2, 0x58, 0x00, 0x00, 0xA1, 0xD4, 0x00, 0x00, /* 0x18-0x1B */ -+ 0x00, 0x00, 0xA2, 0x41, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -+ 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD4, 0x00, 0x00, /* 0x18-0x1B */ - 0x00, 0x00, 0x00, 0x00, 0xA1, 0xDB, 0xA1, 0xE8, /* 0x1C-0x1F */ - 0xA1, 0xE7, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xFD, /* 0x20-0x23 */ - 0x00, 0x00, 0xA1, 0xFC, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ -@@ -3364,7 +3424,7 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ -- 0xA1, 0xDA, 0xA1, 0xDD, 0x00, 0x00, 0xA1, 0xDD, /* 0x60-0x63 */ -+ 0xA1, 0xDA, 0xA1, 0xDD, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ - 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD8, 0xA1, 0xD9, /* 0x64-0x67 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ -@@ -3391,11 +3451,6 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xE9, /* 0xBC-0xBF */ - }; - --static unsigned char u2c_23[512] = { -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x5B, /* 0x04-0x07 */ --}; -- - static unsigned char u2c_25[512] = { - 0xA2, 0x77, 0x00, 0x00, 0xA2, 0x78, 0x00, 0x00, /* 0x00-0x03 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ -@@ -3424,8 +3479,8 @@ - 0xF9, 0xE0, 0xF9, 0xEB, 0xF9, 0xF4, 0xF9, 0xE2, /* 0x60-0x63 */ - 0xF9, 0xE7, 0xF9, 0xF0, 0xF9, 0xDE, 0xF9, 0xED, /* 0x64-0x67 */ - 0xF9, 0xF6, 0xF9, 0xE4, 0xF9, 0xEA, 0xF9, 0xF3, /* 0x68-0x6B */ -- 0xF9, 0xE1, 0xA2, 0x7E, 0xA2, 0xA1, 0xA2, 0xA3, /* 0x6C-0x6F */ -- 0xA2, 0xA2, 0xA2, 0xAC, 0xA2, 0xAD, 0xA2, 0xAE, /* 0x70-0x73 */ -+ 0xF9, 0xE1, 0xF9, 0xFA, 0xF9, 0xFB, 0xF9, 0xFD, /* 0x6C-0x6F */ -+ 0xF9, 0xFC, 0xA2, 0xAC, 0xA2, 0xAD, 0xA2, 0xAE, /* 0x70-0x73 */ - 0xA1, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ -@@ -3461,7 +3516,7 @@ - static unsigned char u2c_26[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ - 0x00, 0x00, 0xA1, 0xB9, 0xA1, 0xB8, 0x00, 0x00, /* 0x04-0x07 */ -- 0x00, 0x00, 0xA1, 0xF3, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -@@ -3475,7 +3530,7 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -- 0xA1, 0xF0, 0xA1, 0xF2, 0xA1, 0xF1, 0x00, 0x00, /* 0x40-0x43 */ -+ 0xA1, 0xF0, 0x00, 0x00, 0xA1, 0xF1, 0x00, 0x00, /* 0x40-0x43 */ - }; - - static unsigned char u2c_30[512] = { -@@ -3486,12 +3541,10 @@ - 0xA1, 0x69, 0xA1, 0x6A, 0xA2, 0x45, 0x00, 0x00, /* 0x10-0x13 */ - 0xA1, 0x65, 0xA1, 0x66, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ -- 0xA1, 0xE3, 0xA1, 0xA9, 0xA1, 0xAA, 0x00, 0x00, /* 0x1C-0x1F */ -+ 0x00, 0x00, 0xA1, 0xA9, 0xA1, 0xAA, 0x00, 0x00, /* 0x1C-0x1F */ - 0x00, 0x00, 0xA2, 0xC3, 0xA2, 0xC4, 0xA2, 0xC5, /* 0x20-0x23 */ - 0xA2, 0xC6, 0xA2, 0xC7, 0xA2, 0xC8, 0xA2, 0xC9, /* 0x24-0x27 */ - 0xA2, 0xCA, 0xA2, 0xCB, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -- 0xA1, 0xCA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ - }; - - static unsigned char u2c_31[512] = { -@@ -3506,36 +3559,6 @@ - 0xA3, 0xB1, 0xA3, 0xB2, 0xA3, 0xB3, 0xA3, 0xB4, /* 0x20-0x23 */ - 0xA3, 0xB5, 0xA3, 0xB6, 0xA3, 0xB7, 0xA3, 0xB8, /* 0x24-0x27 */ - 0xA3, 0xB9, 0xA3, 0xBA, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ -- -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0x40, 0xA4, 0x47, /* 0x90-0x93 */ -- 0xA4, 0x54, 0xA5, 0x7C, 0xA4, 0x57, 0xA4, 0xA4, /* 0x94-0x97 */ -- 0xA4, 0x55, 0xA5, 0xD2, 0xA4, 0x41, 0xA4, 0xFE, /* 0x98-0x9B */ -- 0xA4, 0x42, 0xA4, 0xD1, 0xA6, 0x61, 0xA4, 0x48, /* 0x9C-0x9F */ - }; - - static unsigned char u2c_32[512] = { -@@ -3547,15 +3570,15 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ -- 0xA4, 0x40, 0xA4, 0x47, 0xA4, 0x54, 0xA5, 0x7C, /* 0x20-0x23 */ -- 0xA4, 0xAD, 0xA4, 0xBB, 0xA4, 0x43, 0xA4, 0x4B, /* 0x24-0x27 */ -- 0xA4, 0x45, 0xA4, 0x51, 0xA4, 0xEB, 0xA4, 0xF5, /* 0x28-0x2B */ -- 0xA4, 0xF4, 0xA4, 0xEC, 0xAA, 0xF7, 0xA4, 0x67, /* 0x2C-0x2F */ -- 0xA4, 0xE9, 0xAE, 0xE8, 0xA6, 0xB3, 0xAA, 0xC0, /* 0x30-0x33 */ -- 0xA6, 0x57, 0xAF, 0x53, 0xB0, 0x5D, 0xAF, 0xAC, /* 0x34-0x37 */ -- 0xB3, 0xD2, 0xA5, 0x4E, 0xA9, 0x49, 0xBE, 0xC7, /* 0x38-0x3B */ -- 0xBA, 0xCA, 0xA5, 0xF8, 0xB8, 0xEA, 0xA8, 0xF3, /* 0x3C-0x3F */ -- 0xB2, 0xBD, 0xA5, 0xF0, 0xA6, 0xDB, 0xA6, 0xDC, /* 0x40-0x43 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -@@ -3572,19 +3595,15 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - -- 0xA4, 0x40, 0xA4, 0x47, 0xA4, 0x54, 0xA5, 0x7C, /* 0x80-0x83 */ -- 0xA4, 0xAD, 0xA4, 0xBB, 0xA4, 0x43, 0xA4, 0x4B, /* 0x84-0x87 */ -- 0xA4, 0x45, 0xA4, 0x51, 0xA4, 0xEB, 0xA4, 0xF5, /* 0x88-0x8B */ -- 0xA4, 0xF4, 0xA4, 0xEC, 0xAA, 0xF7, 0xA4, 0x67, /* 0x8C-0x8F */ -- 0xA4, 0xE9, 0xAE, 0xE8, 0xA6, 0xB3, 0xAA, 0xC0, /* 0x90-0x93 */ -- 0xA6, 0x57, 0xAF, 0x53, 0xB0, 0x5D, 0xAF, 0xAC, /* 0x94-0x97 */ -- 0xB3, 0xD2, 0xAF, 0xB5, 0xA8, 0x6B, 0xA4, 0x6B, /* 0x98-0x9B */ -- 0xBE, 0x41, 0xC0, 0x75, 0xA6, 0x4C, 0xAA, 0x60, /* 0x9C-0x9F */ -- 0xB6, 0xB5, 0xA5, 0xF0, 0xBC, 0x67, 0xA1, 0xC0, /* 0xA0-0xA3 */ -- 0xA4, 0x57, 0xA4, 0xA4, 0xA4, 0x55, 0xA5, 0xAA, /* 0xA4-0xA7 */ -- 0xA5, 0x6B, 0xC2, 0xE5, 0xA9, 0x76, 0xBE, 0xC7, /* 0xA8-0xAB */ -- 0xBA, 0xCA, 0xA5, 0xF8, 0xB8, 0xEA, 0xA8, 0xF3, /* 0xAC-0xAF */ -- 0xA9, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC0, /* 0xA0-0xA3 */ - }; - - static unsigned char u2c_33[512] = { -@@ -4594,7 +4613,6 @@ - 0xBE, 0xC8, 0xEC, 0xD8, 0xEC, 0xD9, 0x00, 0x00, /* 0xF0-0xF3 */ - 0x00, 0x00, 0xC3, 0x64, 0xC4, 0x5F, 0x00, 0x00, /* 0xF4-0xF7 */ - 0xA4, 0x6F, 0x00, 0x00, 0xA6, 0x78, 0x00, 0x00, /* 0xF8-0xFB */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ - }; - - static unsigned char u2c_5C[512] = { -@@ -5138,7 +5156,6 @@ - 0xD9, 0x6F, 0xDD, 0x78, 0xD9, 0x60, 0xD9, 0x5B, /* 0xF0-0xF3 */ - 0xB4, 0xA9, 0xD9, 0x61, 0xD9, 0x5E, 0x00, 0x00, /* 0xF4-0xF7 */ - 0x00, 0x00, 0xB4, 0xAE, 0x00, 0x00, 0x00, 0x00, /* 0xF8-0xFB */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ - }; - - static unsigned char u2c_64[512] = { -@@ -6633,7 +6650,6 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ - 0x00, 0x00, 0x00, 0x00, 0xD6, 0xC6, 0xD6, 0xC7, /* 0xF4-0xF7 */ - 0xD6, 0xC5, 0x00, 0x00, 0xD6, 0xC4, 0xB2, 0xBE, /* 0xF8-0xFB */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ - }; - - static unsigned char u2c_7A[512] = { -@@ -9112,91 +9128,12 @@ - 0xF9, 0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ - }; - --static unsigned char u2c_DC[512] = { -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ --}; -- --static unsigned char u2c_F9[512] = { -- 0xB0, 0x5A, 0xA7, 0xF3, 0xA8, 0xAE, 0xB8, 0xEB, /* 0x00-0x03 */ -- 0xB7, 0xC6, 0xA6, 0xEA, 0xA5, 0x79, 0xC0, 0x74, /* 0x04-0x07 */ -- 0xC0, 0x74, 0xAB, 0xB4, 0xAA, 0xF7, 0xB3, 0xE2, /* 0x08-0x0B */ -- 0xA9, 0x60, 0xC3, 0x69, 0xC4, 0xEE, 0xC3, 0xB9, /* 0x0C-0x0F */ -- 0xC5, 0xDA, 0xC1, 0xB3, 0xBB, 0x72, 0xC5, 0xDE, /* 0x10-0x13 */ -- 0xBC, 0xD6, 0xAC, 0xA5, 0xAF, 0x4F, 0xAF, 0x5F, /* 0x14-0x17 */ -- 0xB8, 0xA8, 0xB9, 0x54, 0xC0, 0x64, 0xB6, 0xC3, /* 0x18-0x1B */ -- 0xA7, 0x5A, 0xC4, 0xE6, 0xC4, 0xEA, 0xC4, 0xF5, /* 0x1C-0x1F */ -- 0xC6, 0x7D, 0xB4, 0x50, 0xC0, 0xDD, 0xC2, 0xC5, /* 0x20-0x23 */ -- 0xC4, 0xB0, 0xA9, 0xD4, 0xC3, 0xBE, 0xC4, 0xFA, /* 0x24-0x27 */ -- 0xB4, 0x59, 0xAE, 0xD4, 0xAE, 0xF6, 0xAF, 0x54, /* 0x28-0x2B */ -- 0x00, 0x00, 0xA8, 0xD3, 0xA7, 0x4E, 0xB3, 0xD2, /* 0x2C-0x2F */ -- 0xBE, 0xDB, 0xC3, 0x72, 0xC4, 0x6C, 0xBF, 0x63, /* 0x30-0x33 */ -- 0xA6, 0xD1, 0xC4, 0xAA, 0xB8, 0xB8, 0xB8, 0xF4, /* 0x34-0x37 */ -- 0xC5, 0x53, 0xBE, 0x7C, 0xC6, 0x4F, 0xB8, 0x4C, /* 0x38-0x3B */ -- 0xB8, 0x53, 0xBA, 0xF1, 0xDB, 0x77, 0xBF, 0xFD, /* 0x3C-0x3F */ -- 0xB3, 0xC0, 0xBD, 0xD7, 0xC3, 0x62, 0xA7, 0xCB, /* 0x40-0x43 */ -- 0xC5, 0xA2, 0xC5, 0xA4, 0xA8, 0x63, 0xBD, 0x55, /* 0x44-0x47 */ -- 0xB8, 0xEF, 0xB9, 0x70, 0xC2, 0x53, 0xB9, 0xF0, /* 0x48-0x4B */ -- 0xBC, 0xD3, 0xB2, 0x5C, 0xBA, 0x7C, 0xB2, 0xD6, /* 0x4C-0x4F */ -- 0xC1, 0x5C, 0xAD, 0xAE, 0xB0, 0xC7, 0xA6, 0xD8, /* 0x50-0x53 */ -- 0xBB, 0xFE, 0xAD, 0xE2, 0xB8, 0x57, 0xBA, 0xF0, /* 0x54-0x57 */ -- 0xB5, 0xD9, 0xB3, 0xAE, 0xC5, 0xAA, 0xCE, 0xD4, /* 0x58-0x5B */ -- 0xBC, 0xD6, 0xBF, 0xD5, 0xA4, 0xA6, 0xB9, 0xE7, /* 0x5C-0x5F */ -- 0xAB, 0xE3, 0xB2, 0x76, 0xB2, 0xA7, 0xA5, 0x5F, /* 0x60-0x63 */ -- 0xED, 0xA8, 0xAB, 0x4B, 0xB4, 0x5F, 0xA4, 0xA3, /* 0x64-0x67 */ -- 0xAA, 0x63, 0xBC, 0xC6, 0xAF, 0xC1, 0xB0, 0xD1, /* 0x68-0x6B */ -- 0xB6, 0xEB, 0xAC, 0xD9, 0xB8, 0xAD, 0xBB, 0xA1, /* 0x6C-0x6F */ -- 0xB1, 0xFE, 0xA8, 0xB0, 0xA8, 0x48, 0xAC, 0x42, /* 0x70-0x73 */ -- 0xAD, 0x59, 0xB1, 0xB0, 0xB2, 0xA4, 0xAB, 0x47, /* 0x74-0x77 */ -- 0xA8, 0xE2, 0x00, 0x00, 0xB1, 0xE7, 0xC2, 0xB3, /* 0x78-0x7B */ -- 0xA8, 0x7D, 0xBD, 0xCC, 0xB6, 0x71, 0xC0, 0x79, /* 0x7C-0x7F */ -- -- 0xA7, 0x66, 0xA4, 0x6B, 0xC3, 0x66, 0xAE, 0xC8, /* 0x80-0x83 */ -- 0xC2, 0x6F, 0xC4, 0x72, 0xBE, 0x5B, 0xC6, 0x7A, /* 0x84-0x87 */ -- 0xC4, 0x52, 0xBE, 0xA4, 0xA4, 0x4F, 0xBE, 0xE4, /* 0x88-0x8B */ -- 0xBE, 0xFA, 0xF7, 0x65, 0xA6, 0x7E, 0xBC, 0xA6, /* 0x8C-0x8F */ -- 0xC5, 0xCA, 0xBC, 0xBF, 0xBA, 0xA7, 0xB7, 0xD2, /* 0x90-0x93 */ -- 0xE6, 0xA3, 0x00, 0x00, 0xBD, 0x6D, 0xC1, 0x70, /* 0x94-0x97 */ -- 0xBD, 0xFB, 0xBD, 0xAC, 0xB3, 0x73, 0xC1, 0xE5, /* 0x98-0x9B */ -- 0xA6, 0x43, 0xA6, 0x48, 0xAB, 0x7C, 0xAF, 0x50, /* 0x9C-0x9F */ -- 0xB5, 0xF5, 0xBB, 0xA1, 0xB7, 0x47, 0xA9, 0xC0, /* 0xA0-0xA3 */ -- 0xB1, 0xC9, 0xC0, 0xD4, 0xC3, 0xAE, 0xC2, 0x79, /* 0xA4-0xA7 */ -- 0xA5, 0x4F, 0xCB, 0xF1, 0xB9, 0xE7, 0xC0, 0xAD, /* 0xA8-0xAB */ -- 0xCC, 0xB0, 0xAC, 0xC2, 0xBC, 0xFC, 0xB2, 0xDC, /* 0xAC-0xAF */ -- 0xB2, 0xE2, 0xB9, 0x61, 0xB9, 0x73, 0xC6, 0x46, /* 0xB0-0xB3 */ -- 0xBB, 0xE2, 0xA8, 0xD2, 0xC2, 0xA7, 0xC4, 0xBF, /* 0xB4-0xB7 */ -- 0xC1, 0xF5, 0xB4, 0x63, 0xA4, 0x46, 0xB9, 0xB1, /* 0xB8-0xBB */ -- 0xBC, 0x64, 0xA7, 0xBF, 0xAE, 0xC6, 0xBC, 0xD6, /* 0xBC-0xBF */ -- 0xBF, 0x52, 0xC0, 0xF8, 0xE7, 0x64, 0xBF, 0xF1, /* 0xC0-0xC3 */ -- 0xC0, 0x73, 0xB7, 0x77, 0xA8, 0xBF, 0xBC, 0x42, /* 0xC4-0xC7 */ -- 0xCC, 0xD8, 0xAC, 0x68, 0xAC, 0x79, 0xB7, 0xC8, /* 0xC8-0xCB */ -- 0xAF, 0x5B, 0xAF, 0x64, 0xB2, 0xB8, 0xAF, 0xC3, /* 0xCC-0xCF */ -- 0xC3, 0xFE, 0xA4, 0xBB, 0xBC, 0xAE, 0xB3, 0xB0, /* 0xD0-0xD3 */ -- 0xAD, 0xDB, 0xB1, 0x5B, 0xB2, 0x5F, 0xBD, 0xFC, /* 0xD4-0xD7 */ -- 0xAB, 0xDF, 0xB7, 0x58, 0xAE, 0xDF, 0xB2, 0x76, /* 0xD8-0xDB */ -- 0xB6, 0xA9, 0xA7, 0x51, 0xA6, 0x4F, 0xBC, 0x69, /* 0xDC-0xDF */ -- 0xA9, 0xF6, 0xA7, 0xF5, 0xB1, 0xF9, 0xAA, 0x64, /* 0xE0-0xE3 */ -- 0xB2, 0x7A, 0xB5, 0x67, 0xBF, 0xA9, 0x00, 0x00, /* 0xE4-0xE7 */ -- 0xB8, 0xCC, 0xA8, 0xBD, 0xC2, 0xF7, 0xB0, 0xCE, /* 0xE8-0xEB */ -- 0xB7, 0xC4, 0xA7, 0x5B, 0xBF, 0x4D, 0xBF, 0x5A, /* 0xEC-0xEF */ -- 0xC4, 0xA9, 0x00, 0x00, 0xC5, 0xEC, 0xC5, 0xEF, /* 0xF0-0xF3 */ -- 0xAA, 0x4C, 0xB2, 0x4F, 0xC1, 0x7B, 0xA5, 0xDF, /* 0xF4-0xF7 */ -- 0xB2, 0xC1, 0xB2, 0xC9, 0xAA, 0xAC, 0xAA, 0xA5, /* 0xF8-0xFB */ -- 0xC3, 0xD1, 0xA4, 0xB0, 0xAF, 0xF9, 0xA8, 0xEB, /* 0xFC-0xFF */ --}; - - static unsigned char u2c_FA[512] = { -- 0xA4, 0xC1, 0xAB, 0xD7, 0xA9, 0xDD, 0xBF, 0x7D, /* 0x00-0x03 */ -- 0xA6, 0x76, 0xAC, 0x7D, 0xBC, 0xC9, 0xBF, 0xE7, /* 0x04-0x07 */ -- 0xA6, 0xE6, 0xAD, 0xB0, 0xA8, 0xA3, 0xB9, 0xF8, /* 0x08-0x0B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0xC9, 0x4A, 0xDD, 0xFC, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ -- 0xB6, 0xEF, 0x00, 0x00, 0xB4, 0xB8, 0x00, 0x00, /* 0x10-0x13 */ -- 0x00, 0x00, 0xE8, 0xF9, 0xBD, 0xDE, 0xAF, 0x71, /* 0x14-0x17 */ -- 0x00, 0x00, 0xAF, 0xAB, 0xB2, 0xBB, 0xBA, 0xD6, /* 0x18-0x1B */ -- 0xB9, 0x74, 0xBA, 0xEB, 0xA6, 0xD0, 0x00, 0x00, /* 0x1C-0x1F */ -- 0x00, 0x00, 0x00, 0x00, 0xBD, 0xD1, 0x00, 0x00, /* 0x20-0x23 */ -- 0x00, 0x00, 0xB6, 0x68, 0xB3, 0xA3, 0x00, 0x00, /* 0x24-0x27 */ -- 0x00, 0x00, 0x00, 0x00, 0xB6, 0xBA, 0xB9, 0x7D, /* 0x28-0x2B */ -- 0xC0, 0x5D, 0xC5, 0x62, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ - }; - - static unsigned char u2c_FE[512] = { -@@ -9230,8 +9167,8 @@ - }; - - static unsigned char u2c_FF[512] = { -- 0x00, 0x00, 0xA1, 0x49, 0xA1, 0xA8, 0xA1, 0xAD, /* 0x00-0x03 */ -- 0xA2, 0x43, 0xA2, 0x48, 0xA1, 0xAE, 0xA1, 0xA6, /* 0x04-0x07 */ -+ 0x00, 0x00, 0xA1, 0x49, 0x00, 0x00, 0xA1, 0xAD, /* 0x00-0x03 */ -+ 0xA2, 0x43, 0xA2, 0x48, 0xA1, 0xAE, 0x00, 0x00, /* 0x04-0x07 */ - 0xA1, 0x5D, 0xA1, 0x5E, 0xA1, 0xAF, 0xA1, 0xCF, /* 0x08-0x0B */ - 0xA1, 0x41, 0xA1, 0xD0, 0xA1, 0x44, 0xA1, 0xFE, /* 0x0C-0x0F */ - 0xA2, 0xAF, 0xA2, 0xB0, 0xA2, 0xB1, 0xA2, 0xB2, /* 0x10-0x13 */ -@@ -9244,9 +9181,9 @@ - 0xA2, 0xDA, 0xA2, 0xDB, 0xA2, 0xDC, 0xA2, 0xDD, /* 0x2C-0x2F */ - 0xA2, 0xDE, 0xA2, 0xDF, 0xA2, 0xE0, 0xA2, 0xE1, /* 0x30-0x33 */ - 0xA2, 0xE2, 0xA2, 0xE3, 0xA2, 0xE4, 0xA2, 0xE5, /* 0x34-0x37 */ -- 0xA2, 0xE6, 0xA2, 0xE7, 0xA2, 0xE8, 0xA1, 0x65, /* 0x38-0x3B */ -- 0xA2, 0x40, 0xA1, 0x66, 0xA1, 0x73, 0xA1, 0xC4, /* 0x3C-0x3F */ -- 0xA1, 0xA5, 0xA2, 0xE9, 0xA2, 0xEA, 0xA2, 0xEB, /* 0x40-0x43 */ -+ 0xA2, 0xE6, 0xA2, 0xE7, 0xA2, 0xE8, 0x00, 0x00, /* 0x38-0x3B */ -+ 0xA2, 0x40, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC4, /* 0x3C-0x3F */ -+ 0x00, 0x00, 0xA2, 0xE9, 0xA2, 0xEA, 0xA2, 0xEB, /* 0x40-0x43 */ - 0xA2, 0xEC, 0xA2, 0xED, 0xA2, 0xEE, 0xA2, 0xEF, /* 0x44-0x47 */ - 0xA2, 0xF0, 0xA2, 0xF1, 0xA2, 0xF2, 0xA2, 0xF3, /* 0x48-0x4B */ - 0xA2, 0xF4, 0xA2, 0xF5, 0xA2, 0xF6, 0xA2, 0xF7, /* 0x4C-0x4F */ -@@ -9255,7 +9192,7 @@ - 0xA3, 0x41, 0xA3, 0x42, 0xA3, 0x43, 0xA1, 0x61, /* 0x58-0x5B */ - 0xA1, 0x55, 0xA1, 0x62, 0xA1, 0xE3, 0x00, 0x00, /* 0x5C-0x5F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ -- 0xA1, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ -@@ -9292,11 +9229,11 @@ - }; - - static unsigned char *page_uni2charset[256] = { -- NULL, NULL, u2c_02, u2c_03, NULL, NULL, NULL, NULL, -+ u2c_00, NULL, u2c_02, u2c_03, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- u2c_20, u2c_21, u2c_22, u2c_23, NULL, u2c_25, u2c_26, NULL, -+ u2c_20, u2c_21, u2c_22, NULL, NULL, u2c_25, u2c_26, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - u2c_30, u2c_31, u2c_32, u2c_33, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -@@ -9319,11 +9256,12 @@ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, }; -+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -+ NULL, NULL, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, -+}; - - static unsigned char charset2lower[256] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */ -@@ -9408,22 +9346,23 @@ - if (boundlen <= 0) - return -ENAMETOOLONG; - -- -- uni2charset = page_uni2charset[ch]; -- if (uni2charset) { -- if (boundlen <= 1) -- return -ENAMETOOLONG; -- out[0] = uni2charset[cl*2]; -- out[1] = uni2charset[cl*2+1]; -- if (out[0] == 0x00 && out[1] == 0x00) -- return -EINVAL; -- n = 2; -- } else if (ch==0 && cl) { -- out[0] = cl; -- n = 1; -- } -- else -+ if (ch==0 && cl<0x80) { -+ out[0] = cl; -+ n = 1; -+ } else { -+ uni2charset = page_uni2charset[ch]; -+ if (uni2charset) { -+ if (boundlen <= 1) -+ return -ENAMETOOLONG; -+ out[0] = uni2charset[cl*2]; -+ out[1] = uni2charset[cl*2+1]; -+ if (out[0] == 0x00 && out[1] == 0x00) -+ return -EINVAL; -+ n = 2; -+ } -+ else - return -EINVAL; -+ } - - return n; - } -@@ -9447,7 +9386,7 @@ - cl = rawstring[1]; - - charset2uni = page_charset2uni[ch]; -- if (charset2uni && cl) { -+ if (charset2uni && ((cl>=0x40 && cl<=0x7E) || (cl>=0xA1 && cl<=0xFE))) { - *uni = charset2uni[cl]; - if (*uni == 0x0000) - return -EINVAL; -@@ -9482,20 +9421,4 @@ - module_exit(exit_nls_cp950) - MODULE_LICENSE("Dual BSD/GPL"); - --/* -- * Overrides for Emacs so that we follow Linus's tabbing style. -- * Emacs will notice this stuff at the end of the file and automatically -- * adjust the settings for this buffer only. This must remain at the end -- * of the file. -- * ----------------------------------------------------------------------------- -- * Local variables: -- * c-indent-level: 8 -- * c-brace-imaginary-offset: 0 -- * c-brace-offset: -8 -- * c-argdecl-indent: 8 -- * c-label-offset: -8 -- * c-continued-statement-offset: 8 -- * c-continued-brace-offset: 0 -- * End: -- */ -+ ---- R29/fs/vfat/namei.c 2004-03-24 19:56:04.000000000 +0000 -+++ R63/fs/vfat/namei.c 2005-03-31 06:06:41.000000000 +0100 -@@ -408,9 +408,10 @@ - { - struct msdos_dir_entry *de; - struct buffer_head *bh = NULL; -- int ino,res; -+ loff_t i_pos; -+ int res; - -- res=fat_scan(dir,name,&bh,&de,&ino); -+ res = fat_scan(dir, name, &bh, &de, &i_pos); - fat_brelse(dir->i_sb, bh); - if (res<0) - return -ENOENT; -@@ -891,7 +892,7 @@ - int res, len; - struct msdos_dir_entry *dummy_de; - struct buffer_head *dummy_bh; -- int dummy_ino; -+ loff_t dummy_i_pos; - loff_t dummy; - - dir_slots = (struct msdos_dir_slot *) -@@ -917,7 +918,7 @@ - goto cleanup; - - /* build the empty directory entry of number of slots */ -- offset = fat_add_entries(dir, slots, &dummy_bh, &dummy_de, &dummy_ino); -+ offset = fat_add_entries(dir, slots, &dummy_bh, &dummy_de, &dummy_i_pos); - if (offset < 0) { - res = offset; - goto cleanup; -@@ -927,7 +928,7 @@ - /* Now create the new entry */ - *bh = NULL; - for (slot = 0; slot < slots; slot++) { -- if (fat_get_entry(dir, &offset, bh, de, &sinfo_out->ino) < 0) { -+ if (fat_get_entry(dir, &offset, bh, de, &sinfo_out->i_pos) < 0) { - res = -EIO; - goto cleanup; - } -@@ -972,7 +973,7 @@ - &offset,&sinfo->longname_offset); - if (res>0) { - sinfo->long_slots = res-1; -- if (fat_get_entry(dir,&offset,last_bh,last_de,&sinfo->ino)>=0) -+ if (fat_get_entry(dir,&offset,last_bh,last_de,&sinfo->i_pos)>=0) - return 0; - res = -EIO; - } -@@ -1001,7 +1002,7 @@ - table++; - goto error; - } -- inode = fat_build_inode(dir->i_sb, de, sinfo.ino, &res); -+ inode = fat_build_inode(dir->i_sb, de, sinfo.i_pos, &res); - fat_brelse(dir->i_sb, bh); - if (res) - return ERR_PTR(res); -@@ -1034,7 +1035,7 @@ - res = vfat_add_entry(dir, &dentry->d_name, 0, &sinfo, &bh, &de); - if (res < 0) - return res; -- inode = fat_build_inode(sb, de, sinfo.ino, &res); -+ inode = fat_build_inode(sb, de, sinfo.i_pos, &res); - fat_brelse(sb, bh); - if (!inode) - return res; -@@ -1051,8 +1052,8 @@ - struct buffer_head *bh, struct msdos_dir_entry *de) - { - struct super_block *sb = dir->i_sb; -- loff_t offset; -- int i,ino; -+ loff_t offset, i_pos; -+ int i; - - /* remove the shortname */ - dir->i_mtime = CURRENT_TIME; -@@ -1064,7 +1065,7 @@ - /* remove the longname */ - offset = sinfo->longname_offset; de = NULL; - for (i = sinfo->long_slots; i > 0; --i) { -- if (fat_get_entry(dir, &offset, &bh, &de, &ino) < 0) -+ if (fat_get_entry(dir, &offset, &bh, &de, &i_pos) < 0) - continue; - de->name[0] = DELETED_FLAG; - de->attr = 0; -@@ -1133,7 +1134,7 @@ - res = vfat_add_entry(dir, &dentry->d_name, 1, &sinfo, &bh, &de); - if (res < 0) - return res; -- inode = fat_build_inode(sb, de, sinfo.ino, &res); -+ inode = fat_build_inode(sb, de, sinfo.i_pos, &res); - if (!inode) - goto out; - inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; -@@ -1170,7 +1171,7 @@ - struct super_block *sb = old_dir->i_sb; - struct buffer_head *old_bh,*new_bh,*dotdot_bh; - struct msdos_dir_entry *old_de,*new_de,*dotdot_de; -- int dotdot_ino; -+ loff_t dotdot_i_pos; - struct inode *old_inode, *new_inode; - int res, is_dir; - struct vfat_slot_info old_sinfo,sinfo; -@@ -1185,13 +1186,13 @@ - is_dir = S_ISDIR(old_inode->i_mode); - - if (is_dir && (res = fat_scan(old_inode,MSDOS_DOTDOT,&dotdot_bh, -- &dotdot_de,&dotdot_ino)) < 0) -+ &dotdot_de,&dotdot_i_pos)) < 0) - goto rename_done; - - if (new_dentry->d_inode) { - res = vfat_find(new_dir,&new_dentry->d_name,&sinfo,&new_bh, - &new_de); -- if (res < 0 || MSDOS_I(new_inode)->i_location != sinfo.ino) { -+ if (res < 0 || MSDOS_I(new_inode)->i_pos != sinfo.i_pos) { - /* WTF??? Cry and fail. */ - printk(KERN_WARNING "vfat_rename: fs corrupted\n"); - goto rename_done; -@@ -1215,7 +1216,7 @@ - vfat_remove_entry(old_dir,&old_sinfo,old_bh,old_de); - old_bh=NULL; - fat_detach(old_inode); -- fat_attach(old_inode, sinfo.ino); -+ fat_attach(old_inode, sinfo.i_pos); - mark_inode_dirty(old_inode); - - old_dir->i_version = ++event; ---- R29/include/linux/msdos_fs.h 2004-07-07 09:03:53.000000000 +0100 -+++ R63/include/linux/msdos_fs.h 2005-03-31 06:00:20.000000000 +0100 -@@ -180,7 +180,7 @@ - int total_slots; /* total slots (long and short) */ - loff_t longname_offset; /* dir offset for longname start */ - loff_t shortname_offset; /* dir offset for shortname start */ -- int ino; /* ino for the file */ -+ loff_t i_pos; /* on-disk position of directory entry */ - }; - - /* Determine whether this FS has kB-aligned data. */ -@@ -264,7 +264,7 @@ - unsigned int cmd, unsigned long arg); - extern int fat_dir_empty(struct inode *dir); - extern int fat_add_entries(struct inode *dir, int slots, struct buffer_head **bh, -- struct msdos_dir_entry **de, int *ino); -+ struct msdos_dir_entry **de, loff_t *i_pos); - extern int fat_new_dir(struct inode *dir, struct inode *parent, int is_vfat); - - /* fat/file.c */ -@@ -280,11 +280,11 @@ - - /* fat/inode.c */ - extern void fat_hash_init(void); --extern void fat_attach(struct inode *inode, int i_pos); -+extern void fat_attach(struct inode *inode, loff_t i_pos); - extern void fat_detach(struct inode *inode); --extern struct inode *fat_iget(struct super_block *sb, int i_pos); -+extern struct inode *fat_iget(struct super_block *sb, loff_t i_pos); - extern struct inode *fat_build_inode(struct super_block *sb, -- struct msdos_dir_entry *de, int ino, int *res); -+ struct msdos_dir_entry *de, loff_t i_pos, int *res); - extern void fat_delete_inode(struct inode *inode); - extern void fat_clear_inode(struct inode *inode); - extern void fat_put_super(struct super_block *sb); -@@ -306,26 +306,27 @@ - extern int date_dos2unix(unsigned short time, unsigned short date); - extern void fat_date_unix2dos(int unix_date, unsigned short *time, - unsigned short *date); --extern int fat__get_entry(struct inode *dir, loff_t *pos, struct buffer_head **bh, -- struct msdos_dir_entry **de, int *ino); -+extern int fat__get_entry(struct inode *dir, loff_t *pos, -+ struct buffer_head **bh, -+ struct msdos_dir_entry **de, loff_t *i_pos); - static __inline__ int fat_get_entry(struct inode *dir, loff_t *pos, - struct buffer_head **bh, -- struct msdos_dir_entry **de, int *ino) -+ struct msdos_dir_entry **de, loff_t *i_pos) - { - /* Fast stuff first */ - if (*bh && *de && - (*de - (struct msdos_dir_entry *)(*bh)->b_data) < MSDOS_SB(dir->i_sb)->dir_per_block - 1) { - *pos += sizeof(struct msdos_dir_entry); - (*de)++; -- (*ino)++; -+ (*i_pos)++; - return 0; - } -- return fat__get_entry(dir,pos,bh,de,ino); -+ return fat__get_entry(dir, pos, bh, de, i_pos); - } - extern int fat_subdirs(struct inode *dir); - extern int fat_scan(struct inode *dir, const char *name, - struct buffer_head **res_bh, -- struct msdos_dir_entry **res_de, int *ino); -+ struct msdos_dir_entry **res_de, loff_t *i_pos); - - /* msdos/namei.c - these are for Umsdos */ - extern void msdos_put_super(struct super_block *sb); ---- R29/include/linux/msdos_fs_i.h 2004-03-24 19:56:20.000000000 +0000 -+++ R63/include/linux/msdos_fs_i.h 2005-03-31 05:55:39.000000000 +0100 -@@ -11,7 +11,7 @@ - int i_logstart; /* logical first cluster */ - int i_attrs; /* unused attribute bits */ - int i_ctime_ms; /* unused change time in milliseconds */ -- int i_location; /* on-disk position of directory entry or 0 */ -+ loff_t i_pos; /* on-disk position of directory entry or 0 */ - struct inode *i_fat_inode; /* struct inode of this one */ - struct list_head i_fat_hash; /* hash by i_location */ - }; ---- R29/drivers/scsi/scsi_scan.c 2005-12-13 02:15:15.000000000 +1030 -+++ R63/drivers/scsi/scsi_scan.c 2005-05-31 15:03:23.000000000 +0930 -@@ -703,7 +703,7 @@ - printk("*** %d\n", SDpnt->host->hostt->port); - /* restrict device on certain port grant */ - SDpnt->host->hostt->removable = SDpnt->removable; -- -+#if 0 - if ( SDpnt->removable && (USB_DEVPATH_1 == SDpnt->host->hostt->port) ) - { - create_proc_read_entry("usb_err", -@@ -718,8 +718,9 @@ - shpnt->porttype = 1; - return 0; - } -+#endif - // add by super -- if (SDpnt->removable){ -+ /*if (SDpnt->removable){ - printk("is removable disk \n"); - *IXP425_GPIO_GPOUTR &= 0xfffb; - create_proc_read_entry("usb_conn", -@@ -747,7 +748,7 @@ - NULL - ); - } -- } -+ }*/ - //end - /* - * Check the peripheral qualifier field - this tells us whether LUNS ---- R29/drivers/scsi/sd.c 2005-12-13 02:15:53.000000000 +1030 -+++ R63/drivers/scsi/sd.c 2005-07-02 16:31:14.000000000 +0930 -@@ -1393,7 +1393,9 @@ - * commands if they know what they're doing and they ask for it - * explicitly via the SHpnt->max_sectors API. - */ -- sd_max_sectors[i] = MAX_SEGMENTS*8; -+ //super -+ sd_max_sectors[i] = 8*8; -+ // sd_max_sectors[i] = MAX_SEGMENTS*8; - } - - for (i = 0; i < N_USED_SD_MAJORS; i++) { diff --git a/recipes/linux/unslung-kernel/missing-usb-ioctls.patch b/recipes/linux/unslung-kernel/missing-usb-ioctls.patch deleted file mode 100644 index ba4c606d48..0000000000 --- a/recipes/linux/unslung-kernel/missing-usb-ioctls.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4.22/include/linux/usbdevice_fs.h.orig 2004-10-31 20:05:45.989296261 +1100 -+++ linux-2.4.22/include/linux/usbdevice_fs.h 2004-10-31 22:55:50.470987905 +1100 -@@ -142,6 +142,8 @@ - #define USBDEVFS_HUB_PORTINFO _IOR('U', 19, struct usbdevfs_hub_portinfo) - #define USBDEVFS_RESET _IO('U', 20) - #define USBDEVFS_CLEAR_HALT _IOR('U', 21, unsigned int) -+#define USBDEVFS_DISCONNECT _IO('U', 22) -+#define USBDEVFS_CONNECT _IO('U', 23) - - /* --------------------------------------------------------------------- */ - diff --git a/recipes/linux/unslung-kernel/netconsole.patch b/recipes/linux/unslung-kernel/netconsole.patch deleted file mode 100644 index 9d297300e1..0000000000 --- a/recipes/linux/unslung-kernel/netconsole.patch +++ /dev/null @@ -1,394 +0,0 @@ -diff -Naur linux-2.4.22/drivers/net/Config.in.orig linux-2.4.22/drivers/net/Config.in ---- linux-2.4.22/drivers/net/Config.in.orig 2006-02-26 11:49:28.000000000 -0600 -+++ linux-2.4.22/drivers/net/Config.in 2006-02-26 11:40:31.000000000 -0600 -@@ -338,6 +338,8 @@ - dep_tristate ' SysKonnect FDDI PCI support' CONFIG_SKFP $CONFIG_PCI - fi - -+dep_tristate 'Network logging support' CONFIG_NETCONSOLE -+ - if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - if [ "$CONFIG_INET" = "y" ]; then - bool 'HIPPI driver support (EXPERIMENTAL)' CONFIG_HIPPI -diff -Naur linux-2.4.22/drivers/net/Makefile.orig linux-2.4.22/drivers/net/Makefile ---- linux-2.4.22/drivers/net/Makefile.orig 2006-02-26 11:49:45.000000000 -0600 -+++ linux-2.4.22/drivers/net/Makefile 2006-02-26 11:38:58.000000000 -0600 -@@ -272,6 +272,8 @@ - obj-y += ../acorn/net/acorn-net.o - endif - -+obj-$(CONFIG_NETCONSOLE) += netconsole.o -+ - # - # HIPPI adapters - # -diff -Naur linux-2.4.22/drivers/net/netconsole.c.orig linux-2.4.22/drivers/net/netconsole.c ---- linux-2.4.22/drivers/net/netconsole.c.orig 2006-07-02 23:40:44.597695500 -0500 -+++ linux-2.4.22/drivers/net/netconsole.c 2006-07-10 15:58:44.000000000 -0500 -@@ -0,0 +1,353 @@ -+/* linux/drivers/net/netconsole.c -+ * -+ * Copyright (C) 2001 Ingo Molnar <mingo@redhat.com> -+ * -+ * This file contains the implementation of an IRQ-safe, crash-safe -+ * kernel console implementation that outputs kernel messages to the -+ * network. -+ * -+ * Modification history: -+ * -+ * 2001-09-17 started by Ingo Molnar. -+ * 2006-02-26 very minor modifications to suit the NSLU2 w/Unslung -- Mike Westerhof. -+ * 2006-07-10 usability mods for Unslung (text only, and IP addrs) -- Mike Westerhof. -+ */ -+ -+/**************************************************************** -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ ****************************************************************/ -+ -+#include <net/tcp.h> -+#include <net/udp.h> -+#include <linux/mm.h> -+#include <linux/tty.h> -+#include <linux/init.h> -+#include <linux/module.h> -+#include <asm/unaligned.h> -+#include <linux/console.h> -+#include <linux/smp_lock.h> -+#include <linux/netdevice.h> -+#include <linux/tty_driver.h> -+#include <linux/etherdevice.h> -+ -+static struct net_device *netconsole_dev; -+static u16 source_port, target_port; -+static u32 source_ip, target_ip, target_ipaddr; -+static unsigned char daddr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff} ; -+ -+#define NETCONSOLE_VERSION 0x01 -+/* HEADER_LEN was "5" -- it's zero for Unslung; makes it work better with netcat */ -+#define HEADER_LEN 0 -+ -+#define MAX_UDP_CHUNK 1460 -+#define MAX_PRINT_CHUNK (MAX_UDP_CHUNK-HEADER_LEN) -+ -+/* -+ * We maintain a small pool of fully-sized skbs, -+ * to make sure the message gets out even in -+ * extreme OOM situations. -+ */ -+/* Was 32, lowered to 16 for Unslung (to save memory) */ -+#define MAX_NETCONSOLE_SKBS 16 -+ -+ -+static spinlock_t netconsole_lock = SPIN_LOCK_UNLOCKED; -+static int nr_netconsole_skbs; -+static struct sk_buff *netconsole_skbs; -+ -+#define MAX_SKB_SIZE \ -+ (MAX_UDP_CHUNK + sizeof(struct udphdr) + \ -+ sizeof(struct iphdr) + sizeof(struct ethhdr)) -+ -+static void __refill_netconsole_skbs(void) -+{ -+ struct sk_buff *skb; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&netconsole_lock, flags); -+ while (nr_netconsole_skbs < MAX_NETCONSOLE_SKBS) { -+ skb = alloc_skb(MAX_SKB_SIZE, GFP_ATOMIC); -+ if (!skb) -+ break; -+ if (netconsole_skbs) -+ skb->next = netconsole_skbs; -+ else -+ skb->next = NULL; -+ netconsole_skbs = skb; -+ nr_netconsole_skbs++; -+ } -+ spin_unlock_irqrestore(&netconsole_lock, flags); -+} -+ -+static struct sk_buff * get_netconsole_skb(void) -+{ -+ struct sk_buff *skb; -+ -+ unsigned long flags; -+ -+ spin_lock_irqsave(&netconsole_lock, flags); -+ skb = netconsole_skbs; -+ if (skb) -+ netconsole_skbs = skb->next; -+ skb->next = NULL; -+ nr_netconsole_skbs--; -+ spin_unlock_irqrestore(&netconsole_lock, flags); -+ -+ return skb; -+} -+ -+static spinlock_t sequence_lock = SPIN_LOCK_UNLOCKED; -+static unsigned int offset; -+ -+static void send_netconsole_skb(struct net_device *dev, const char *msg, unsigned int msg_len) -+{ -+ int total_len, eth_len, ip_len, udp_len; -+ unsigned long flags; -+ struct sk_buff *skb; -+ struct udphdr *udph; -+ struct iphdr *iph; -+ struct ethhdr *eth; -+ -+ udp_len = msg_len + HEADER_LEN + sizeof(*udph); -+ ip_len = eth_len = udp_len + sizeof(*iph); -+ total_len = eth_len + ETH_HLEN; -+ -+ if (nr_netconsole_skbs < MAX_NETCONSOLE_SKBS) -+ __refill_netconsole_skbs(); -+ -+ skb = alloc_skb(total_len, GFP_ATOMIC); -+ if (!skb) { -+ skb = get_netconsole_skb(); -+ if (!skb) -+ /* tough! */ -+ return; -+ } -+ -+ atomic_set(&skb->users, 1); -+ skb_reserve(skb, total_len - msg_len - HEADER_LEN); -+/* Header data removed for Unslung -- its presence makes netcat less useful -+ * skb->data[0] = NETCONSOLE_VERSION; -+ * -+ * spin_lock_irqsave(&sequence_lock, flags); -+ * put_unaligned(htonl(offset), (u32 *) (skb->data + 1)); -+ * offset += msg_len; -+ * spin_unlock_irqrestore(&sequence_lock, flags); -+ */ -+ memcpy(skb->data + HEADER_LEN, msg, msg_len); -+ skb->len += msg_len + HEADER_LEN; -+ -+ udph = (struct udphdr *) skb_push(skb, sizeof(*udph)); -+ udph->source = source_port; -+ udph->dest = target_port; -+ udph->len = htons(udp_len); -+ udph->check = 0; -+ -+ iph = (struct iphdr *)skb_push(skb, sizeof(*iph)); -+ -+ iph->version = 4; -+ iph->ihl = 5; -+ iph->tos = 0; -+ iph->tot_len = htons(ip_len); -+ iph->id = 0; -+ iph->frag_off = 0; -+ iph->ttl = 64; -+ iph->protocol = IPPROTO_UDP; -+ iph->check = 0; -+ iph->saddr = source_ip; -+ iph->daddr = target_ip; -+ iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl); -+ -+ eth = (struct ethhdr *) skb_push(skb, ETH_HLEN); -+ -+ eth->h_proto = htons(ETH_P_IP); -+ memcpy(eth->h_source, dev->dev_addr, dev->addr_len); -+ memcpy(eth->h_dest, daddr, dev->addr_len); -+ -+repeat: -+ spin_lock(&dev->xmit_lock); -+ dev->xmit_lock_owner = smp_processor_id(); -+ -+ if (netif_queue_stopped(dev)) { -+ dev->xmit_lock_owner = -1; -+ spin_unlock(&dev->xmit_lock); -+ -+ dev->poll_controller(dev); -+ goto repeat; -+ } -+ -+ dev->hard_start_xmit(skb, dev); -+ -+ dev->xmit_lock_owner = -1; -+ spin_unlock(&dev->xmit_lock); -+} -+ -+static void write_netconsole_msg(struct console *con, const char *msg, unsigned int msg_len) -+{ -+ int len, left; -+ struct net_device *dev; -+ -+ dev = netconsole_dev; -+ if (!dev) -+ return; -+ -+ if (dev->poll_controller && netif_running(dev)) { -+ unsigned long flags; -+ -+ __save_flags(flags); -+ __cli(); -+ left = msg_len; -+repeat: -+ if (left > MAX_PRINT_CHUNK) -+ len = MAX_PRINT_CHUNK; -+ else -+ len = left; -+ send_netconsole_skb(dev, msg, len); -+ msg += len; -+ left -= len; -+ if (left) -+ goto repeat; -+ __restore_flags(flags); -+ } -+} -+ -+static char *dev; -+static int target_eth_byte0 = 255; -+static int target_eth_byte1 = 255; -+static int target_eth_byte2 = 255; -+static int target_eth_byte3 = 255; -+static int target_eth_byte4 = 255; -+static int target_eth_byte5 = 255; -+ -+MODULE_AUTHOR("Ingo Molnar <mingo@redhat.com>"); -+MODULE_DESCRIPTION("kernel network console implementation"); -+MODULE_LICENSE("GPL"); -+MODULE_PARM(target_ip, "i"); -+MODULE_PARM(target_ipaddr, "s"); -+MODULE_PARM(target_eth_byte0, "i"); -+MODULE_PARM(target_eth_byte1, "i"); -+MODULE_PARM(target_eth_byte2, "i"); -+MODULE_PARM(target_eth_byte3, "i"); -+MODULE_PARM(target_eth_byte4, "i"); -+MODULE_PARM(target_eth_byte5, "i"); -+MODULE_PARM(source_port, "h"); -+MODULE_PARM(target_port, "h"); -+MODULE_PARM(dev, "s"); -+ -+static struct console netconsole = -+ { flags: CON_ENABLED, write: write_netconsole_msg }; -+ -+static int init_netconsole(void) -+{ -+ struct net_device *ndev = NULL; -+ struct in_device *in_dev; -+ -+ // Set some reasonable defaults, at least for the NSLU2 device -+ if (!target_port) -+ target_port = 6666; -+ if (!source_port) -+ source_port = 6665; -+ if (!dev) -+ dev = "ixp0"; -+ -+ printk(KERN_INFO "netconsole: using network device <%s>\n", dev); -+ // this will be valid once the device goes up. -+ if (dev) -+ ndev = dev_get_by_name(dev); -+ if (!ndev) { -+ printk(KERN_ERR "netconsole: network device %s does not exist, aborting.\n", dev); -+ return -1; -+ } -+ if (!ndev->poll_controller) { -+ printk(KERN_ERR "netconsole: %s's network driver does not implement netlogging yet, aborting.\n", dev); -+ return -1; -+ } -+ in_dev = in_dev_get(ndev); -+ if (!in_dev) { -+ printk(KERN_ERR "netconsole: network device %s is not an IP protocol device, aborting.\n", dev); -+ return -1; -+ } -+ source_ip = ntohl(in_dev->ifa_list->ifa_local); -+ if (!source_ip) { -+ printk(KERN_ERR "netconsole: network device %s has no local address, aborting.\n", dev); -+ return -1; -+ } -+ source_ip = htonl(source_ip); -+#define IP(x) ((char *)&source_ip)[x] -+ printk(KERN_INFO "netconsole: using source IP %i.%i.%i.%i\n", -+ IP(0), IP(1), IP(2), IP(3)); -+#undef IP -+ if (!target_ipaddr) { -+ if (!target_ip) { -+ printk(KERN_ERR "netconsole: neither target_ipaddr nor target_ip parameter not specified, aborting.\n"); -+ return -1; -+ } else { -+ target_ip = htonl(target_ip); -+ } -+ } else { -+ target_ip = in_aton(target_ipaddr); -+ } -+#define IP(x) ((char *)&target_ip)[x] -+ printk(KERN_INFO "netconsole: using target IP %i.%i.%i.%i\n", -+ IP(0), IP(1), IP(2), IP(3)); -+#undef IP -+ if (!source_port) { -+ printk(KERN_ERR "netconsole: source_port parameter not specified, aborting.\n"); -+ return -1; -+ } -+ printk(KERN_INFO "netconsole: using source UDP port: %i\n", source_port); -+ source_port = htons(source_port); -+ if (!target_port) { -+ printk(KERN_ERR "netconsole: target_port parameter not specified, aborting.\n"); -+ return -1; -+ } -+ printk(KERN_INFO "netconsole: using target UDP port: %i\n", target_port); -+ target_port = htons(target_port); -+ -+ daddr[0] = target_eth_byte0; -+ daddr[1] = target_eth_byte1; -+ daddr[2] = target_eth_byte2; -+ daddr[3] = target_eth_byte3; -+ daddr[4] = target_eth_byte4; -+ daddr[5] = target_eth_byte5; -+ -+ if ((daddr[0] & daddr[1] & daddr[2] & daddr[3] & daddr[4] & daddr[5]) == 255) -+ printk(KERN_INFO "netconsole: using broadcast ethernet frames to send packets.\n"); -+ else -+ printk(KERN_INFO "netconsole: using target ethernet address %02x:%02x:%02x:%02x:%02x:%02x.\n", daddr[0], daddr[1], daddr[2], daddr[3], daddr[4], daddr[5]); -+ -+ netconsole_dev = ndev; -+#define STARTUP_MSG "[...network console startup...]\n" -+ write_netconsole_msg(NULL, STARTUP_MSG, strlen(STARTUP_MSG)); -+ -+ register_console(&netconsole); -+ printk(KERN_INFO "netconsole: network logging started up successfully!\n"); -+ return 0; -+} -+ -+static void cleanup_netconsole(void) -+{ -+ printk(KERN_INFO "netconsole: network logging shut down.\n"); -+ unregister_console(&netconsole); -+ -+#define SHUTDOWN_MSG "[...network console shutdown...]\n" -+ write_netconsole_msg(NULL, SHUTDOWN_MSG, strlen(SHUTDOWN_MSG)); -+ netconsole_dev = NULL; -+} -+ -+module_init(init_netconsole); -+module_exit(cleanup_netconsole); -+ -+int dummy = MAX_SKB_SIZE; -diff -Naur linux-2.4.22/include/linux/netdevice.h.orig linux-2.4.22/include/linux/netdevice.h ---- linux-2.4.22/include/linux/netdevice.h.orig 2006-02-26 11:50:24.000000000 -0600 -+++ linux-2.4.22/include/linux/netdevice.h 2006-02-26 11:37:14.000000000 -0600 -@@ -428,6 +428,9 @@ - int (*neigh_setup)(struct net_device *dev, struct neigh_parms *); - int (*accept_fastpath)(struct net_device *, struct dst_entry*); - -+#define HAVE_POLL_CONTROLLER -+ void (*poll_controller)(struct net_device *dev); -+ - /* open/release and usage marking */ - struct module *owner; - diff --git a/recipes/linux/unslung-kernel/nfs-blocksize.patch b/recipes/linux/unslung-kernel/nfs-blocksize.patch deleted file mode 100644 index 7200af16e8..0000000000 --- a/recipes/linux/unslung-kernel/nfs-blocksize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4.22/include/linux/nfsd/const.h.orig 2005-04-02 16:02:17.000000000 +0930 -+++ linux-2.4.22/include/linux/nfsd/const.h 2005-04-02 16:02:25.000000000 +0930 -@@ -21,7 +21,7 @@ - /* - * Maximum blocksize supported by daemon currently at 8K - */ --#define NFSSVC_MAXBLKSIZE (8*1024) -+#define NFSSVC_MAXBLKSIZE (32*1024) - - #ifdef __KERNEL__ - diff --git a/recipes/linux/unslung-kernel/nofpu.patch b/recipes/linux/unslung-kernel/nofpu.patch deleted file mode 100644 index c23eceb506..0000000000 --- a/recipes/linux/unslung-kernel/nofpu.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.4.22/arch/arm/Makefile~nofpu 2004-09-08 19:34:11.000000000 -0500 -+++ linux-2.4.22/arch/arm/Makefile 2004-09-08 20:03:34.000000000 -0500 -@@ -76,7 +76,7 @@ - - CFLAGS_BOOT :=$(apcs-y) $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float -Uarm - CFLAGS +=$(apcs-y) $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float -Uarm --AFLAGS +=$(apcs-y) $(arch-y) -mno-fpu -msoft-float -+AFLAGS +=$(apcs-y) $(arch-y) -msoft-float - - ifeq ($(CONFIG_CPU_26),y) - PROCESSOR := armo ---- linux-2.4.22/-~nofpu -+++ linux-2.4.22/- diff --git a/recipes/linux/unslung-kernel/pl2303.patch b/recipes/linux/unslung-kernel/pl2303.patch deleted file mode 100644 index d8813f5419..0000000000 --- a/recipes/linux/unslung-kernel/pl2303.patch +++ /dev/null @@ -1,782 +0,0 @@ ---- linux-2.4.22/drivers/usb/serial/pl2303.h.orig 2005-04-02 20:15:34.000000000 +0930 -+++ linux-2.4.22/drivers/usb/serial/pl2303.h 2005-04-02 21:29:03.000000000 +0930 -@@ -12,6 +12,7 @@ - #define PL2303_PRODUCT_ID_RSAQ2 0x04bb - - #define ATEN_VENDOR_ID 0x0557 -+#define ATEN_VENDOR_ID2 0x0547 - #define ATEN_PRODUCT_ID 0x2008 - - #define IODATA_VENDOR_ID 0x04bb -@@ -40,3 +41,12 @@ - - #define SITECOM_VENDOR_ID 0x6189 - #define SITECOM_PRODUCT_ID 0x2068 -+ -+/* Alcatel OT535/735 USB cable */ -+#define ALCATEL_VENDOR_ID 0x11f7 -+#define ALCATEL_PRODUCT_ID 0x02df -+ -+/* Samsung I330 phone cradle */ -+#define SAMSUNG_VENDOR_ID 0x04e8 -+#define SAMSUNG_PRODUCT_ID 0x8001 -+ ---- linux-2.4.22/drivers/usb/serial/pl2303.c.orig 2005-04-02 20:15:34.000000000 +0930 -+++ linux-2.4.22/drivers/usb/serial/pl2303.c 2005-04-02 21:29:03.000000000 +0930 -@@ -1,7 +1,7 @@ - /* - * Prolific PL2303 USB to serial adaptor driver - * -- * Copyright (C) 2001-2003 Greg Kroah-Hartman (greg@kroah.com) -+ * Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com) - * Copyright (C) 2003 IBM Corp. - * - * Original driver for 2.2.x by anonymous -@@ -12,8 +12,16 @@ - * (at your option) any later version. - * - * See Documentation/usb/usb-serial.txt for more information on using this driver -- * 2003_Apr_24 gkh -- * Added line error reporting support. Hopefully it is correct... -+ * -+ * -+ * 2005_Mar_05 grsch -+ * ported 2.6.8 pl2303.c to 2.4.20 format -+ * (HX model works fine now, ID table should be brought up to date) -+ * Gregor Schaffrath <gschaff@ran-dom.org> -+ * -+ * 2002_Mar_26 gkh -+ * allowed driver to work properly if there is no tty assigned to a port -+ * (this happens for serial console devices.) - * - * 2001_Oct_06 gkh - * Added RTS and DTR line control. Thanks to joe@bndlg.de for parts of it. -@@ -33,6 +41,9 @@ - * - */ - -+static int debug; -+ -+ - #include <linux/config.h> - #include <linux/kernel.h> - #include <linux/errno.h> -@@ -46,24 +57,15 @@ - #include <linux/spinlock.h> - #include <asm/uaccess.h> - #include <linux/usb.h> -- --#ifdef CONFIG_USB_SERIAL_DEBUG -- static int debug = 1; --#else -- static int debug; --#endif -- - #include "usb-serial.h" - #include "pl2303.h" - - /* - * Version Information - */ --#define DRIVER_VERSION "v0.10" -+#define DRIVER_VERSION "v0.11" - #define DRIVER_DESC "Prolific PL2303 USB to serial adaptor driver" - -- -- - static struct usb_device_id id_table [] = { - { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID) }, - { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ2) }, -@@ -72,16 +74,27 @@ - { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) }, - { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID) }, - { USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) }, -- { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) }, -- { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) }, -- { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) }, -- { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, -- { USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) }, -+ { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) }, -+ { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) }, -+ { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) }, -+ { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, -+ { USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) }, -+ { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_ID) }, -+ { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_ID) }, - { } /* Terminating entry */ - }; - - MODULE_DEVICE_TABLE (usb, id_table); - -+/* -+static struct usb_driver pl2303_driver = { -+ .owner = THIS_MODULE, -+ .name = "pl2303", -+ .probe = usb_serial_probe, -+ .disconnect = usb_serial_disconnect, -+ .id_table = id_table, -+}; -+*/ - - #define SET_LINE_REQUEST_TYPE 0x21 - #define SET_LINE_REQUEST 0x20 -@@ -106,6 +119,7 @@ - #define VENDOR_READ_REQUEST 0x01 - - #define UART_STATE 0x08 -+#define UART_STATE_TRANSIENT_MASK 0x74 - #define UART_DCD 0x01 - #define UART_DSR 0x02 - #define UART_BREAK_ERROR 0x04 -@@ -128,6 +142,9 @@ - static int pl2303_write (struct usb_serial_port *port, int from_user, - const unsigned char *buf, int count); - static void pl2303_break_ctl(struct usb_serial_port *port,int break_state); -+static int pl2303_tiocmget (struct usb_serial_port *port, struct file *file); -+static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file, -+ unsigned int set, unsigned int clear); - static int pl2303_startup (struct usb_serial *serial); - static void pl2303_shutdown (struct usb_serial *serial); - -@@ -147,33 +164,57 @@ - .ioctl = pl2303_ioctl, - .break_ctl = pl2303_break_ctl, - .set_termios = pl2303_set_termios, -+ //.tiocmget = pl2303_tiocmget, -+ //.tiocmset = pl2303_tiocmset, - .read_bulk_callback = pl2303_read_bulk_callback, - .read_int_callback = pl2303_read_int_callback, - .write_bulk_callback = pl2303_write_bulk_callback, -+ //.attach = pl2303_startup, - .startup = pl2303_startup, - .shutdown = pl2303_shutdown, - }; - -+enum pl2303_type { -+ type_0, /* don't know the difference between type 0 and */ -+ type_1, /* type 1, until someone from prolific tells us... */ -+ HX, /* HX version of the pl2303 chip */ -+}; -+ - struct pl2303_private { - spinlock_t lock; -+ wait_queue_head_t delta_msr_wait; - u8 line_control; - u8 line_status; - u8 termios_initialized; -+ enum pl2303_type type; - }; - - - static int pl2303_startup (struct usb_serial *serial) - { - struct pl2303_private *priv; -+ enum pl2303_type type = type_0; - int i; - -+ if (serial->dev->descriptor.bDeviceClass == 0x02) -+ type = type_0; -+ else if (serial->dev->descriptor.bMaxPacketSize0 == 0x40) -+ type = HX; -+ else if (serial->dev->descriptor.bDeviceClass == 0x00) -+ type = type_1; -+ else if (serial->dev->descriptor.bDeviceClass == 0xFF) -+ type = type_1; -+ dbg("device type: %d", type); -+ - for (i = 0; i < serial->num_ports; ++i) { - priv = kmalloc (sizeof (struct pl2303_private), GFP_KERNEL); - if (!priv) - return -ENOMEM; - memset (priv, 0x00, sizeof (struct pl2303_private)); - spin_lock_init(&priv->lock); -- usb_set_serial_port_data(&serial->port[i], priv); -+ init_waitqueue_head(&priv->delta_msr_wait); -+ priv->type = type; -+ serial->port[i].private = priv; - } - return 0; - } -@@ -195,6 +236,9 @@ - - dbg("%s - port %d, %d bytes", __FUNCTION__, port->number, count); - -+ if (!count) -+ return count; -+ - if (port->write_urb->status == -EINPROGRESS) { - dbg("%s - already writing", __FUNCTION__); - return 0; -@@ -208,13 +252,13 @@ - memcpy (port->write_urb->transfer_buffer, buf, count); - } - -- usb_serial_debug_data (__FILE__, __FUNCTION__, count, port->write_urb->transfer_buffer); -+ usb_serial_debug_data(__FILE__, __FUNCTION__, count, port->write_urb->transfer_buffer); - - port->write_urb->transfer_buffer_length = count; - port->write_urb->dev = port->serial->dev; - result = usb_submit_urb (port->write_urb); - if (result) -- err("%s - failed submitting write urb, error %d", __FUNCTION__, result); -+ err("%s - failed submitting write urb, error %d\n", __FUNCTION__, result); - else - result = count; - -@@ -226,7 +270,7 @@ - static void pl2303_set_termios (struct usb_serial_port *port, struct termios *old_termios) - { - struct usb_serial *serial = port->serial; -- struct pl2303_private *priv = usb_get_serial_port_data(port); -+ struct pl2303_private *priv = port->private; - unsigned long flags; - unsigned int cflag; - unsigned char *buf; -@@ -234,8 +278,7 @@ - int i; - u8 control; - -- dbg("%s - port %d, initialized = %d", __FUNCTION__, port->number, -- priv->termios_initialized); -+ dbg("%s - port %d", __FUNCTION__, port->number); - - if ((!port->tty) || (!port->tty->termios)) { - dbg("%s - no tty structures", __FUNCTION__); -@@ -262,7 +305,7 @@ - - buf = kmalloc (7, GFP_KERNEL); - if (!buf) { -- err("%s - out of memory.", __FUNCTION__); -+ err("%s - out of memory.\n", __FUNCTION__); - return; - } - memset (buf, 0x00, 0x07); -@@ -304,7 +347,7 @@ - case B230400: baud = 230400; break; - case B460800: baud = 460800; break; - default: -- err ("pl2303 driver does not support the baudrate requested (fix it)"); -+ err("pl2303 driver does not support the baudrate requested (fix it)\n"); - break; - } - dbg("%s - baud = %d", __FUNCTION__, baud); -@@ -373,31 +416,39 @@ - buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]); - - if (cflag & CRTSCTS) { -- i = usb_control_msg (serial->dev, usb_sndctrlpipe (serial->dev, 0), -- VENDOR_WRITE_REQUEST, VENDOR_WRITE_REQUEST_TYPE, -- 0x0, 0x41, NULL, 0, 100); -- dbg ("0x40:0x1:0x0:0x41 %d", i); -+ __u16 index; -+ if (priv->type == HX) -+ index = 0x61; -+ else -+ index = 0x41; -+ i = usb_control_msg(serial->dev, -+ usb_sndctrlpipe(serial->dev, 0), -+ VENDOR_WRITE_REQUEST, -+ VENDOR_WRITE_REQUEST_TYPE, -+ 0x0, index, NULL, 0, 100); -+ dbg ("0x40:0x1:0x0:0x%x %d", index, i); - } - - kfree (buf); --} -- -+} - - static int pl2303_open (struct usb_serial_port *port, struct file *filp) - { - struct termios tmp_termios; - struct usb_serial *serial = port->serial; -- unsigned char buf[10]; -+ struct pl2303_private *priv = port->private; -+ unsigned char *buf; - int result; - -- if (port_paranoia_check (port, __FUNCTION__)) -- return -ENODEV; -- - dbg("%s - port %d", __FUNCTION__, port->number); - - usb_clear_halt(serial->dev, port->write_urb->pipe); - usb_clear_halt(serial->dev, port->read_urb->pipe); - -+ buf = kmalloc(10, GFP_KERNEL); -+ if (buf==NULL) -+ return -ENOMEM; -+ - #define FISH(a,b,c,d) \ - result=usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev,0), \ - b, a, c, d, buf, 1, 100); \ -@@ -416,6 +467,20 @@ - SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 0x0404, 1); - FISH (VENDOR_READ_REQUEST_TYPE, VENDOR_READ_REQUEST, 0x8484, 0); - FISH (VENDOR_READ_REQUEST_TYPE, VENDOR_READ_REQUEST, 0x8383, 0); -+ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 0, 1); -+ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 1, 0); -+ -+ if (priv->type == HX) { -+ /* HX chip */ -+ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 2, 0x44); -+ /* reset upstream data pipes */ -+ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 8, 0); -+ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 9, 0); -+ } else { -+ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 2, 0x24); -+ } -+ -+ kfree(buf); - - /* Setup termios */ - if (port->tty) { -@@ -428,7 +493,7 @@ - port->read_urb->dev = serial->dev; - result = usb_submit_urb (port->read_urb); - if (result) { -- err("%s - failed submitting read urb, error %d", __FUNCTION__, result); -+ err("%s - failed submitting read urb, error %d\n", __FUNCTION__, result); - pl2303_close (port, NULL); - return -EPROTO; - } -@@ -437,7 +502,7 @@ - port->interrupt_in_urb->dev = serial->dev; - result = usb_submit_urb (port->interrupt_in_urb); - if (result) { -- err("%s - failed submitting interrupt urb, error %d", __FUNCTION__, result); -+ err("%s - failed submitting interrupt urb, error %d\n", __FUNCTION__, result); - pl2303_close (port, NULL); - return -EPROTO; - } -@@ -447,119 +512,133 @@ - - static void pl2303_close (struct usb_serial_port *port, struct file *filp) - { -- struct usb_serial *serial; - struct pl2303_private *priv; - unsigned long flags; - unsigned int c_cflag; - int result; - -- if (port_paranoia_check (port, __FUNCTION__)) -- return; -- serial = get_usb_serial (port, __FUNCTION__); -- if (!serial) -- return; -- - dbg("%s - port %d", __FUNCTION__, port->number); - -- if (serial->dev) { -- if (port->tty) { -- c_cflag = port->tty->termios->c_cflag; -- if (c_cflag & HUPCL) { -- /* drop DTR and RTS */ -- priv = usb_get_serial_port_data(port); -- spin_lock_irqsave(&priv->lock, flags); -- priv->line_control = 0; -- spin_unlock_irqrestore (&priv->lock, flags); -- set_control_lines (port->serial->dev, 0); -- } -- } -+ /* shutdown our urbs */ -+ dbg("%s - shutting down urbs", __FUNCTION__); -+ result = usb_unlink_urb (port->write_urb); -+ if (result) -+ dbg("%s - usb_unlink_urb (write_urb)" -+ " failed with reason: %d", __FUNCTION__, -+ result); - -- /* shutdown our urbs */ -- dbg("%s - shutting down urbs", __FUNCTION__); -- result = usb_unlink_urb (port->write_urb); -- if (result) -- dbg("%s - usb_unlink_urb (write_urb)" -- " failed with reason: %d", __FUNCTION__, -- result); -+ result = usb_unlink_urb (port->read_urb); -+ if (result) -+ dbg("%s - usb_unlink_urb (read_urb) " -+ "failed with reason: %d", __FUNCTION__, -+ result); - -- result = usb_unlink_urb (port->read_urb); -- if (result) -- dbg("%s - usb_unlink_urb (read_urb) " -- "failed with reason: %d", __FUNCTION__, -- result); -+ result = usb_unlink_urb (port->interrupt_in_urb); -+ if (result) -+ dbg("%s - usb_unlink_urb (interrupt_in_urb)" -+ " failed with reason: %d", __FUNCTION__, -+ result); - -- result = usb_unlink_urb (port->interrupt_in_urb); -- if (result) -- dbg("%s - usb_unlink_urb (interrupt_in_urb)" -- " failed with reason: %d", __FUNCTION__, -- result); -+ if (port->tty) { -+ c_cflag = port->tty->termios->c_cflag; -+ if (c_cflag & HUPCL) { -+ /* drop DTR and RTS */ -+ priv = port->private; -+ spin_lock_irqsave(&priv->lock, flags); -+ priv->line_control = 0; -+ spin_unlock_irqrestore (&priv->lock, flags); -+ set_control_lines (port->serial->dev, 0); -+ } - } -+ - } - -+/* taken from 2.4.20 driver */ - static int set_modem_info (struct usb_serial_port *port, unsigned int cmd, unsigned int *value) - { -- struct pl2303_private *priv = usb_get_serial_port_data(port); -- unsigned long flags; -- unsigned int arg; -- u8 control; -- -- if (copy_from_user(&arg, value, sizeof(int))) -- return -EFAULT; -+ struct pl2303_private *priv = port->private; -+ unsigned int arg; - -- spin_lock_irqsave (&priv->lock, flags); -- switch (cmd) { -- case TIOCMBIS: -- if (arg & TIOCM_RTS) -- priv->line_control |= CONTROL_RTS; -- if (arg & TIOCM_DTR) -- priv->line_control |= CONTROL_DTR; -- break; -- -- case TIOCMBIC: -- if (arg & TIOCM_RTS) -- priv->line_control &= ~CONTROL_RTS; -- if (arg & TIOCM_DTR) -- priv->line_control &= ~CONTROL_DTR; -- break; -- -- case TIOCMSET: -- /* turn off RTS and DTR and then only turn -- on what was asked to */ -- priv->line_control &= ~(CONTROL_RTS | CONTROL_DTR); -- priv->line_control |= ((arg & TIOCM_RTS) ? CONTROL_RTS : 0); -- priv->line_control |= ((arg & TIOCM_DTR) ? CONTROL_DTR : 0); -- break; -- } -- control = priv->line_control; -- spin_unlock_irqrestore (&priv->lock, flags); -- -- return set_control_lines (port->serial->dev, control); -+ if (copy_from_user(&arg, value, sizeof(int))) -+ return -EFAULT; -+ -+ switch (cmd) { -+ case TIOCMBIS: -+ if (arg & TIOCM_RTS) -+ priv->line_control |= CONTROL_RTS; -+ if (arg & TIOCM_DTR) -+ priv->line_control |= CONTROL_DTR; -+ break; -+ -+ case TIOCMBIC: -+ if (arg & TIOCM_RTS) -+ priv->line_control &= ~CONTROL_RTS; -+ if (arg & TIOCM_DTR) -+ priv->line_control &= ~CONTROL_DTR; -+ break; -+ -+ case TIOCMSET: -+ /* turn off RTS and DTR and then only turn -+ on what was asked to */ -+ priv->line_control &= ~(CONTROL_RTS | CONTROL_DTR); -+ priv->line_control |= ((arg & TIOCM_RTS) ? CONTROL_RTS : 0); -+ priv->line_control |= ((arg & TIOCM_DTR) ? CONTROL_DTR : 0); -+ break; -+ } -+ -+ return set_control_lines (port->serial->dev, priv->line_control); - } - - static int get_modem_info (struct usb_serial_port *port, unsigned int *value) - { -- struct pl2303_private *priv = usb_get_serial_port_data(port); -+ struct pl2303_private *priv = port->private; -+ unsigned int mcr = priv->line_control; -+ unsigned int result; -+ -+ result = ((mcr & CONTROL_DTR) ? TIOCM_DTR : 0) -+ | ((mcr & CONTROL_RTS) ? TIOCM_RTS : 0); -+ -+ dbg("%s - result = %x", __FUNCTION__, result); -+ -+ if (copy_to_user(value, &result, sizeof(int))) -+ return -EFAULT; -+ return 0; -+} -+/* end of 2.4.20 kernel part - grsch */ -+ -+static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) -+{ -+ struct pl2303_private *priv = port->private; - unsigned long flags; -- unsigned int mcr; -+ unsigned int prevstatus; - unsigned int status; -- unsigned int result; -+ unsigned int changed; - - spin_lock_irqsave (&priv->lock, flags); -- mcr = priv->line_control; -- status = priv->line_status; -+ prevstatus = priv->line_status; - spin_unlock_irqrestore (&priv->lock, flags); - -- result = ((mcr & CONTROL_DTR) ? TIOCM_DTR : 0) -- | ((mcr & CONTROL_RTS) ? TIOCM_RTS : 0) -- | ((status & UART_CTS) ? TIOCM_CTS : 0) -- | ((status & UART_DSR) ? TIOCM_DSR : 0) -- | ((status & UART_RING) ? TIOCM_RI : 0) -- | ((status & UART_DCD) ? TIOCM_CD : 0); -- -- dbg("%s - result = %x", __FUNCTION__, result); -- -- if (copy_to_user(value, &result, sizeof(int))) -- return -EFAULT; -+ while (1) { -+ interruptible_sleep_on(&priv->delta_msr_wait); -+ /* see if a signal did it */ -+ if (signal_pending(current)) -+ return -ERESTARTSYS; -+ -+ spin_lock_irqsave (&priv->lock, flags); -+ status = priv->line_status; -+ spin_unlock_irqrestore (&priv->lock, flags); -+ -+ changed=prevstatus^status; -+ -+ if (((arg & TIOCM_RNG) && (changed & UART_RING)) || -+ ((arg & TIOCM_DSR) && (changed & UART_DSR)) || -+ ((arg & TIOCM_CD) && (changed & UART_DCD)) || -+ ((arg & TIOCM_CTS) && (changed & UART_CTS)) ) { -+ return 0; -+ } -+ prevstatus = status; -+ } -+ /* NOTREACHED */ - return 0; - } - -@@ -568,16 +647,9 @@ - dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd); - - switch (cmd) { -- -- case TIOCMGET: -- dbg("%s (%d) TIOCMGET", __FUNCTION__, port->number); -- return get_modem_info (port, (unsigned int *)arg); -- -- case TIOCMBIS: -- case TIOCMBIC: -- case TIOCMSET: -- dbg("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET", __FUNCTION__, port->number); -- return set_modem_info(port, cmd, (unsigned int *) arg); -+ case TIOCMIWAIT: -+ dbg("%s (%d) TIOCMIWAIT", __FUNCTION__, port->number); -+ return wait_modem_info(port, arg); - - default: - dbg("%s not supported = 0x%04x", __FUNCTION__, cmd); -@@ -616,8 +688,8 @@ - dbg("%s", __FUNCTION__); - - for (i = 0; i < serial->num_ports; ++i) { -- kfree (usb_get_serial_port_data(&serial->port[i])); -- usb_set_serial_port_data(&serial->port[i], NULL); -+ kfree (serial->port[i].private); -+ serial->port[i].private = NULL; - } - } - -@@ -625,15 +697,14 @@ - static void pl2303_read_int_callback (struct urb *urb) - { - struct usb_serial_port *port = (struct usb_serial_port *) urb->context; -- struct usb_serial *serial = get_usb_serial (port, __FUNCTION__); -- struct pl2303_private *priv = usb_get_serial_port_data(port); -+ struct pl2303_private *priv = port->private; - unsigned char *data = urb->transfer_buffer; - unsigned long flags; -+ int status; -+ u8 uart_state; - - dbg("%s (%d)", __FUNCTION__, port->number); - -- /* ints auto restart... */ -- - switch (urb->status) { - case 0: - /* success */ -@@ -646,32 +717,34 @@ - return; - default: - dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); -- return; -+ goto exit; - } - -- if (!serial) { -- return; -- } - -- usb_serial_debug_data (__FILE__, __FUNCTION__, urb->actual_length, urb->transfer_buffer); -+ usb_serial_debug_data(__FILE__, __FUNCTION__, urb->actual_length, urb->transfer_buffer); - - if (urb->actual_length < UART_STATE) -- return; -+ goto exit; - - /* Save off the uart status for others to look at */ -+ uart_state = data[UART_STATE]; - spin_lock_irqsave(&priv->lock, flags); -- priv->line_status = data[UART_STATE]; -+ uart_state |= (priv->line_status & UART_STATE_TRANSIENT_MASK); -+ priv->line_status = uart_state; - spin_unlock_irqrestore(&priv->lock, flags); -- -- return; -+ -+exit: -+ status = usb_submit_urb (urb); -+ if (status) -+ err("%s - usb_submit_urb failed with result %d\n", -+ __FUNCTION__, status); - } - - - static void pl2303_read_bulk_callback (struct urb *urb) - { - struct usb_serial_port *port = (struct usb_serial_port *) urb->context; -- struct usb_serial *serial = get_usb_serial (port, __FUNCTION__); -- struct pl2303_private *priv = usb_get_serial_port_data(port); -+ struct pl2303_private *priv = port->private; - struct tty_struct *tty; - unsigned char *data = urb->transfer_buffer; - unsigned long flags; -@@ -680,16 +753,8 @@ - u8 status; - char tty_flag; - -- if (port_paranoia_check (port, __FUNCTION__)) -- return; -- - dbg("%s - port %d", __FUNCTION__, port->number); - -- if (!serial) { -- dbg("%s - bad serial pointer, exiting", __FUNCTION__); -- return; -- } -- - if (urb->status) { - dbg("%s - urb->status = %d", __FUNCTION__, urb->status); - if (!port->open_count) { -@@ -700,24 +765,26 @@ - /* PL2303 mysteriously fails with -EPROTO reschedule the read */ - dbg("%s - caught -EPROTO, resubmitting the urb", __FUNCTION__); - urb->status = 0; -- urb->dev = serial->dev; -+ urb->dev = port->serial->dev; - result = usb_submit_urb(urb); - if (result) -- err("%s - failed resubmitting read urb, error %d", __FUNCTION__, result); -+ err("%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result); - return; - } - dbg("%s - unable to handle the error, exiting.", __FUNCTION__); - return; - } - -- usb_serial_debug_data (__FILE__, __FUNCTION__, urb->actual_length, data); -+ usb_serial_debug_data(__FILE__, __FUNCTION__, urb->actual_length, data); - - /* get tty_flag from status */ - tty_flag = TTY_NORMAL; - - spin_lock_irqsave(&priv->lock, flags); - status = priv->line_status; -+ priv->line_status &= ~UART_STATE_TRANSIENT_MASK; - spin_unlock_irqrestore(&priv->lock, flags); -+ wake_up_interruptible (&priv->delta_msr_wait); - - /* break takes precedence over parity, */ - /* which takes precedence over framing errors */ -@@ -746,10 +813,10 @@ - - /* Schedule the next read _if_ we are still open */ - if (port->open_count) { -- urb->dev = serial->dev; -+ urb->dev = port->serial->dev; - result = usb_submit_urb(urb); - if (result) -- err("%s - failed resubmitting read urb, error %d", __FUNCTION__, result); -+ err("%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result); - } - - return; -@@ -762,44 +829,32 @@ - struct usb_serial_port *port = (struct usb_serial_port *) urb->context; - int result; - -- if (port_paranoia_check (port, __FUNCTION__)) -- return; -- - dbg("%s - port %d", __FUNCTION__, port->number); - - if (urb->status) { - /* error in the urb, so we have to resubmit it */ -- if (serial_paranoia_check (port->serial, __FUNCTION__)) { -- return; -- } - dbg("%s - Overflow in write", __FUNCTION__); - dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); - port->write_urb->transfer_buffer_length = 1; - port->write_urb->dev = port->serial->dev; - result = usb_submit_urb (port->write_urb); - if (result) -- err("%s - failed resubmitting write urb, error %d", __FUNCTION__, result); -+ err("%s - failed resubmitting write urb, error %d\n", __FUNCTION__, result); - - return; - } - -- queue_task(&port->tqueue, &tq_immediate); -- mark_bh(IMMEDIATE_BH); - -- return; -+ queue_task(&port->tqueue, &tq_immediate); -+ mark_bh(IMMEDIATE_BH); - } - - - static int __init pl2303_init (void) - { -- int retval; -- retval = usb_serial_register(&pl2303_device); -- if (retval) -- goto failed_usb_serial_register; -+ usb_serial_register(&pl2303_device); - info(DRIVER_DESC " " DRIVER_VERSION); - return 0; --failed_usb_serial_register: -- return retval; - } - - -@@ -818,3 +873,4 @@ - MODULE_PARM(debug, "i"); - MODULE_PARM_DESC(debug, "Debug enabled or not"); - -+//this is an error diff --git a/recipes/linux/unslung-kernel/pl2303_mdmctl.patch b/recipes/linux/unslung-kernel/pl2303_mdmctl.patch deleted file mode 100644 index aeebb9ea6e..0000000000 --- a/recipes/linux/unslung-kernel/pl2303_mdmctl.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- linux-2.4.22/drivers/usb/serial/pl2303.c 2006-05-12 16:05:17.000000000 -0400
-+++ linux-2.4.22-fred/drivers/usb/serial/pl2303.c 2006-05-12 18:00:39.000000000 -0400
-@@ -642,14 +642,56 @@ static int wait_modem_info(struct usb_se
- return 0;
- }
-
-+
- static int pl2303_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg)
- {
-+ struct pl2303_private *priv = port->private;
-+ unsigned int value;
-+
- dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd);
-
- switch (cmd) {
- case TIOCMIWAIT:
- dbg("%s (%d) TIOCMIWAIT", __FUNCTION__, port->number);
- return wait_modem_info(port, arg);
-+
-+ case TIOCMGET:
-+ value = ((priv->line_control & CONTROL_DTR) ? TIOCM_DTR : 0)
-+ | ((priv->line_control & CONTROL_RTS) ? TIOCM_RTS : 0)
-+ | ((priv->line_status & UART_CTS) ? TIOCM_CTS : 0)
-+ | ((priv->line_status & UART_DSR) ? TIOCM_DSR : 0)
-+ | ((priv->line_status & UART_RING) ? TIOCM_RI : 0)
-+ | ((priv->line_status & UART_DCD) ? TIOCM_CD : 0);
-+
-+ if (put_user(value, (unsigned int *) arg))
-+ return -EFAULT;
-+ return 0;
-+
-+ case TIOCMSET:
-+ if (get_user(value, (unsigned int *) arg))
-+ return -EFAULT;
-+ priv->line_control &= ~(CONTROL_RTS | CONTROL_DTR);
-+ priv->line_control |= ((arg & TIOCM_RTS) ? CONTROL_RTS : 0);
-+ priv->line_control |= ((arg & TIOCM_DTR) ? CONTROL_DTR : 0);
-+ return set_control_lines (port->serial->dev, priv->line_control);
-+
-+ case TIOCMBIS:
-+ if (get_user(value, (unsigned int *) arg))
-+ return -EFAULT;
-+ if (value & TIOCM_RTS)
-+ priv->line_control |= CONTROL_RTS;
-+ if (value & TIOCM_DTR)
-+ priv->line_control |= CONTROL_DTR;
-+ return set_control_lines (port->serial->dev, priv->line_control);
-+
-+ case TIOCMBIC:
-+ if (get_user(value, (unsigned int *) arg))
-+ return -EFAULT;
-+ if (value & TIOCM_RTS)
-+ priv->line_control &= ~CONTROL_RTS;
-+ if (value & TIOCM_DTR)
-+ priv->line_control &= ~CONTROL_DTR;
-+ return set_control_lines (port->serial->dev, priv->line_control);
-
- default:
- dbg("%s not supported = 0x%04x", __FUNCTION__, cmd);
diff --git a/recipes/linux/unslung-kernel/ppp_mppe.patch b/recipes/linux/unslung-kernel/ppp_mppe.patch deleted file mode 100644 index 145405b001..0000000000 --- a/recipes/linux/unslung-kernel/ppp_mppe.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- linux-2.4.22/drivers/net/ppp_mppe.c~ 2005-03-05 00:36:26.000000000 +1030 -+++ linux-2.4.22/drivers/net/ppp_mppe.c 2005-03-05 00:52:49.000000000 +1030 -@@ -651,7 +651,7 @@ - *************************************************************/ - - static int __init --init_module(void) -+ppp_mppe_init_module(void) - { - int answer = ppp_register_compressor(&ppp_mppe); - if (answer == 0) { -@@ -662,7 +662,7 @@ - - - void --cleanup_module(void) -+ppp_mppe_cleanup_module(void) - { - if (MOD_IN_USE) { - printk (KERN_INFO "MPPE module busy, remove delayed\n"); -@@ -672,6 +672,6 @@ - } - } - --module_init(init_module); --module_exit(cleanup_module); -+module_init(ppp_mppe_init_module); -+module_exit(ppp_mppe_cleanup_module); - diff --git a/recipes/linux/unslung-kernel/ppp_mppe_no_fp_in_kernel.patch b/recipes/linux/unslung-kernel/ppp_mppe_no_fp_in_kernel.patch deleted file mode 100644 index b068a5a8c6..0000000000 --- a/recipes/linux/unslung-kernel/ppp_mppe_no_fp_in_kernel.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- linux-2.4.22/drivers/net/ppp_mppe.c~ 2006-04-15 12:23:04.000000000 -0500 -+++ linux-2.4.22/drivers/net/ppp_mppe.c 2006-04-17 20:24:39.000000000 -0500 -@@ -507,7 +507,10 @@ - (state->stats).bytes_out = (state->stats).comp_bytes; - - /* this _SHOULD_ always be 1 */ -+#if 0 -+ /* the kernel may not do floating point calculations, so don't do this. */ - (state->stats).ratio = (state->stats).in_count/(state->stats).bytes_out; -+#endif - - *stats = state->stats; - diff --git a/recipes/linux/unslung-kernel/short_loadbytes.patch b/recipes/linux/unslung-kernel/short_loadbytes.patch deleted file mode 100644 index f0b514225c..0000000000 --- a/recipes/linux/unslung-kernel/short_loadbytes.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.4.22/arch/arm/Makefile~short_loadbytes 2004-09-08 19:34:45.000000000 -0500 -+++ linux-2.4.22/arch/arm/Makefile 2004-09-08 19:34:53.000000000 -0500 -@@ -74,8 +74,8 @@ - tune-$(CONFIG_CPU_XSCALE) :=-mtune=strongarm - endif - --CFLAGS_BOOT :=$(apcs-y) $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float -Uarm --CFLAGS +=$(apcs-y) $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float -Uarm -+CFLAGS_BOOT :=$(apcs-y) $(arch-y) $(tune-y) $(call check_gcc,-malignment-traps,-mshort-load-bytes) -msoft-float -Uarm -+CFLAGS +=$(apcs-y) $(arch-y) $(tune-y) $(call check_gcc,-malignment-traps,-mshort-load-bytes) -msoft-float -Uarm - AFLAGS +=$(apcs-y) $(arch-y) -msoft-float - - ifeq ($(CONFIG_CPU_26),y) diff --git a/recipes/linux/unslung-kernel/usbnet.patch b/recipes/linux/unslung-kernel/usbnet.patch deleted file mode 100644 index 84af8ee1a4..0000000000 --- a/recipes/linux/unslung-kernel/usbnet.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- linux-2.4.22/drivers/usb/usbnet.c.orig 2004-09-19 03:08:09.000000000 -0400 -+++ linux-2.4.22/drivers/usb/usbnet.c 2004-09-19 03:10:58.000000000 -0400 -@@ -314,8 +314,6 @@ MODULE_PARM_DESC (msg_level, "Initial me - #define RUN_CONTEXT (in_irq () ? "in_irq" \ - : (in_interrupt () ? "in_interrupt" : "can sleep")) - --static struct ethtool_ops usbnet_ethtool_ops; -- - /* mostly for PDA style devices, which are always present */ - static int always_connected (struct usbnet *dev) - { -@@ -2515,7 +2513,6 @@ usbnet_probe (struct usb_device *udev, u - net->watchdog_timeo = TX_TIMEOUT_JIFFIES; - net->tx_timeout = usbnet_tx_timeout; - net->do_ioctl = usbnet_ioctl; -- net->ethtool_ops = &usbnet_ethtool_ops; - - // allow device-specific bind/init procedures - // NOTE net->name still not usable ... -@@ -2738,13 +2735,6 @@ static struct usb_driver usbnet_driver = - .disconnect = usbnet_disconnect, - }; - --/* Default ethtool_ops assigned. Devices can override in their bind() routine */ --static struct ethtool_ops usbnet_ethtool_ops = { -- .get_drvinfo = usbnet_get_drvinfo, -- .get_link = usbnet_get_link, -- .get_msglevel = usbnet_get_msglevel, -- .set_msglevel = usbnet_set_msglevel, --}; - /*-------------------------------------------------------------------------*/ - - static int __init usbnet_init (void) ---- linux-2.4.22/drivers/net/Makefile.orig 2004-09-21 19:29:09.000000000 -0400 -+++ linux-2.4.22/drivers/net/Makefile 2004-09-21 19:30:33.000000000 -0400 -@@ -267,6 +267,7 @@ obj-$(CONFIG_AMD8111_ETH) += amd8111e.o - - # non-drivers/net drivers who want mii lib - obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o -+obj-$(CONFIG_USB_USBNET) += mii.o - - ifeq ($(CONFIG_ARCH_ACORN),y) - mod-subdirs += ../acorn/net diff --git a/recipes/linux/unslung-kernel_2.4.22.l2.3r63.bb b/recipes/linux/unslung-kernel_2.4.22.l2.3r63.bb deleted file mode 100644 index cf9ef31c95..0000000000 --- a/recipes/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ /dev/null @@ -1,53 +0,0 @@ -SECTION = "kernel" -DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device" -LICENSE = "GPL" -PR = "r22" - -COMPATIBLE_HOST = 'arm.*-linux' -COMPATIBLE_MACHINE = "nslu2" - -UNSLUNG_KERNEL_EXTRA_SRC_URI ?= "" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2 \ - http://nslu.sf.net/downloads/xfs-2.4.22-all-i386.bz2;patch=1 \ - http://nslu.sf.net/downloads/2.4.22-xfs-nslu2.patch.bz2;patch=1 \ - file://config-fixes.patch;patch=1 \ - file://nofpu.patch;patch=1 \ - file://short_loadbytes.patch;patch=1 \ - file://gcc3-userfuncs.patch;patch=1 \ - file://gcc-registerparanoia.patch;patch=1 \ - file://linux-2.4.24-attribute-used.patch;patch=1 \ - file://double_cpdo.patch;patch=1 \ - file://linux-kernel-R25_to_R29.patch;patch=1 \ - file://linux-kernel-R29_to_R63.patch;patch=1 \ - file://flash-is-now-hdd.patch;patch=1 \ - file://gl811e.patch;patch=1 \ - file://usbnet.patch;patch=1 \ - file://missing-usb-ioctls.patch;patch=1 \ - file://anonymiser.patch;patch=1 \ - file://ppp_mppe.patch;patch=1 \ - file://nfs-blocksize.patch;patch=1 \ - file://pl2303.patch;patch=1 \ - file://pl2303_mdmctl.patch;patch=1 \ - file://netconsole.patch;patch=1 \ - file://ppp_mppe_no_fp_in_kernel.patch;patch=1 \ - file://defconfig \ - ${UNSLUNG_KERNEL_EXTRA_SRC_URI}" -S = "${WORKDIR}/linux-2.4.22" - -inherit kernel - -ARCH = "arm" -KERNEL_SUFFIX = "nslu2be" -CMDLINE_CONSOLE ?= "ttyS0,115200" -CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000" -CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}" - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config - rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \ - ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch -} -KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}-${DATETIME}" -KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}" diff --git a/recipes/meta/unslung-packages.bb b/recipes/meta/unslung-packages.bb deleted file mode 100644 index ca194979e7..0000000000 --- a/recipes/meta/unslung-packages.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Packages that are compatible with the Unslung firmware" -LICENSE = "MIT" -PR = "r5" -COMPATIBLE_MACHINE = "nslu2" - -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" - -inherit meta - -UNSLUNG_PACKAGES = "\ - " - -BROKEN_PACKAGES = "\ - " - -DEPENDS = 'unslung-image \ - ${UNSLUNG_PACKAGES} \ - package-index' diff --git a/recipes/minilite/files/makefile-fix.patch b/recipes/minilite/files/makefile-fix.patch new file mode 100644 index 0000000000..1be6ceaa8b --- /dev/null +++ b/recipes/minilite/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2006-01-16 22:51:34.000000000 +0100 ++++ minilite-050/Makefile 2009-05-01 16:36:32.000000000 +0200 +@@ -45,7 +45,7 @@ + + install-program: all + mkdir -p $(DESTDIR)$(PREFIX)/bin +- $(INSTALL) -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ $(INSTALL) $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/applications + $(INSTALL) -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications/$(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps/ diff --git a/recipes/minilite/minilite_0.41.bb b/recipes/minilite/minilite_0.41.bb index 0f5b126043..997ae93e7d 100644 --- a/recipes/minilite/minilite_0.41.bb +++ b/recipes/minilite/minilite_0.41.bb @@ -7,4 +7,6 @@ DESCRIPTION = "GPE Screen light control dockapp" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" +SRC_URI += "file://makefile-fix.patch;patch=1" + export CVSBUILD="no" diff --git a/recipes/minilite/minilite_0.43.bb b/recipes/minilite/minilite_0.43.bb index 0f5b126043..997ae93e7d 100644 --- a/recipes/minilite/minilite_0.43.bb +++ b/recipes/minilite/minilite_0.43.bb @@ -7,4 +7,6 @@ DESCRIPTION = "GPE Screen light control dockapp" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" +SRC_URI += "file://makefile-fix.patch;patch=1" + export CVSBUILD="no" diff --git a/recipes/minilite/minilite_0.44.bb b/recipes/minilite/minilite_0.44.bb index 0f5b126043..997ae93e7d 100644 --- a/recipes/minilite/minilite_0.44.bb +++ b/recipes/minilite/minilite_0.44.bb @@ -7,4 +7,6 @@ DESCRIPTION = "GPE Screen light control dockapp" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" +SRC_URI += "file://makefile-fix.patch;patch=1" + export CVSBUILD="no" diff --git a/recipes/minilite/minilite_0.47.bb b/recipes/minilite/minilite_0.47.bb index 0f5b126043..997ae93e7d 100644 --- a/recipes/minilite/minilite_0.47.bb +++ b/recipes/minilite/minilite_0.47.bb @@ -7,4 +7,6 @@ DESCRIPTION = "GPE Screen light control dockapp" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" +SRC_URI += "file://makefile-fix.patch;patch=1" + export CVSBUILD="no" diff --git a/recipes/minilite/minilite_0.48.bb b/recipes/minilite/minilite_0.48.bb index 0f5b126043..997ae93e7d 100644 --- a/recipes/minilite/minilite_0.48.bb +++ b/recipes/minilite/minilite_0.48.bb @@ -7,4 +7,6 @@ DESCRIPTION = "GPE Screen light control dockapp" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" +SRC_URI += "file://makefile-fix.patch;patch=1" + export CVSBUILD="no" diff --git a/recipes/minilite/minilite_0.49.bb b/recipes/minilite/minilite_0.49.bb index 0f5b126043..997ae93e7d 100644 --- a/recipes/minilite/minilite_0.49.bb +++ b/recipes/minilite/minilite_0.49.bb @@ -7,4 +7,6 @@ DESCRIPTION = "GPE Screen light control dockapp" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" +SRC_URI += "file://makefile-fix.patch;patch=1" + export CVSBUILD="no" diff --git a/recipes/minilite/minilite_0.50.bb b/recipes/minilite/minilite_0.50.bb index 0f5b126043..997ae93e7d 100644 --- a/recipes/minilite/minilite_0.50.bb +++ b/recipes/minilite/minilite_0.50.bb @@ -7,4 +7,6 @@ DESCRIPTION = "GPE Screen light control dockapp" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" +SRC_URI += "file://makefile-fix.patch;patch=1" + export CVSBUILD="no" diff --git a/recipes/nandlogical/nandlogical-static_1.0.0.bb b/recipes/nandlogical/nandlogical-static_1.0.0.bb index 8332008654..d595d00d62 100644 --- a/recipes/nandlogical/nandlogical-static_1.0.0.bb +++ b/recipes/nandlogical/nandlogical-static_1.0.0.bb @@ -1,5 +1,3 @@ -PR = "r2" - require nandlogical_${PV}.bb do_compile () { diff --git a/recipes/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb b/recipes/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb deleted file mode 100644 index 4da6b6981a..0000000000 --- a/recipes/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Linksys NSLU2 Stock Firmware Samba Code Pages." -PACKAGE_ARCH = "nslu2" -SECTION = "base" -PRIORITY = "required" -PR = "r2" - -SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2" - -S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63" - -do_install () { - ( cd ${S} ; mkdir unslung-tmp ) - ( cd ${S}/etc ; tar cvf - samba/codepages ) | ( cd ${S}/unslung-tmp; tar xvf - ) - ( cd ${S} ; rm -rf bin dev etc home lib lost+found mnt proc sbin share tmp upload usr var ) - ( cd ${S} ; mv unslung-tmp etc ) - ( cd ${S}/etc/samba/codepages; rm -f codepage.437 unicode_map.437 ) - ( cd ${S}/etc/samba/codepages; rm -f codepage.850 unicode_map.850 ) - ( cd ${S}/etc/samba/codepages; rm -f unicode_map.ISO8859-1 ) - ( cd ${S} ; tar cvf - . ) | ( cd ${D} ; tar xvf - ) -} - -FILES_${PN} = "/etc/samba/codepages" - -COMPATIBLE_MACHINE = "nslu2" diff --git a/recipes/nslu2-binary-only/unslung-rootfs/NOTES b/recipes/nslu2-binary-only/unslung-rootfs/NOTES deleted file mode 100644 index 801ebd918c..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/NOTES +++ /dev/null @@ -1,573 +0,0 @@ -Unslung-6.x Family Release Notes - -Unslung is a replacement firmware image for the Linksys NSLU2 which is designed -to allow you to make changes to the root filesystem (including the installation -of downloadable packages) while still providing all the standard product -functionality. - -If, at any time, you have any questions concerning the installation or -operation of Unslung firmware, your first port of call should be the -NSLU2-Linux wiki at: - - http://www.nslu2-linux.org - -Specifically, check the HowTos and the Frequently Asked Questions before -posting to the mailing list or asking a question in the IRC channel -[#nslu2-general @ irc.freenode.net]. - -OK! Now that that's out of the way... - -This file is provided to give general information and usage notes for the -Unslung 6.x firmware. If you are looking for installation instructions, please -stop now and go to the README file. Follow the README instructions WORD for -WORD to keep from turning your NSLU2 into a brick. The information contained -in this file will make more sense if you have already "unslung" your NSLU2. - --------------------------------------------------------------------------------- - -These "Notes" are divided into four sections: - - 1 - GENERAL INFORMATION - 2 - IPKG PACKAGES - 3 - DIVERSION SCRIPTS - 4 - CHANGELOG - - -GENERAL INFORMATION - -As stated above, Unslung firmware is a replacement firmware image for the -Linksys NSLU2. The Unslung firmware is intended to be used for loading new -packages (giving enhanced or additional functionality) with minimal changes -to the standard user interface and firmware. The differences in the Unslung 6.x -firmware from the standard Linksys 2.3R63 firmware can be found at: - - http://www.nslu2-linux.org/wiki/Unslung/UnslungFeatures - -For more information about the Unslung firmware, including details on how to -build it from source code yourself, look at: - - http://www.nslu2-linux.org/wiki/Unslung - -There are several assumptions made in this Notes. One, you've successfully -unslung your NSLU2, and can verify the basic Linksys functionality (samba -users, groups, and shares setup with the Linksys interface). Two, that you can -get telnet or ssh shell access to your NSLU2 from any computer on the same -network as the NSLU2. Three, that you have read and understand the NSLU2-linux -community rules at: - - http://www.nslu2-linux.org/wiki/Main/HomePage - -If you understand the third assumption, then you also understand that there is -an emphasis on using and developing the NSLU2-Linux wiki. Clarifications and -further documentation is always welcomed on the wiki. - -If you are experienced with the Linux operating system, then you can make -changes directly to the root filesystem - changes which are persistent across -reboot. If you want to get involved, then check the NSLU2-linux wiki at: - - http://www.nslu2-linux.org/wiki/Main/HowToGetInvolved - - -IPKG PACKAGES - -Packages require you to be running Unslung firmware (as you may have already -guessed!) In general, ipkg packages are commonly available software packages -that have been ported to the NSLU2 - giving enhanced or additional -functionality. If you run into problems or have specific question with a -certain package, you should look on the Internet for the general documentation -about the package first. If your problem is specific to the NSLU2 port, then -check for further documentation for the corresponding package on the -NSLU2-Linux wiki at: - - http://www.nslu2-linux.org/wiki/Unslung/Packages - -When you "unsling" an external disk (check the README for instructions), -downloaded packages will be installed onto that external disk. The number of -packages that you can install is only limited by the size of the "data" -partition on the external disk. Note that you *must* *not* install any -packages before you have booted with an external "Unslung" disk. To do so will -almost certainly cause your internal jffs2 flash memory become full, and cause -you to have to reflash your NSLU2. - -Package Installation Details - - 1) Check for network connectivity to the package repository from the NSLU2 - first: "ping ipkg.nslu2-linux.org" - - - If this does not work, then please check the NSLU2 DNS settings in - the web interface (under "Administration", "LAN"). - - 3) Update the list of available packages from new feeds: "ipkg update" - - 4) Check the list of available packages for ones that you want on your - NSLU2: "ipkg list" - - 5) Install the packages: "ipkg install <package-name>" - -Most packages put their startup scripts into /opt/etc/init.d - which the -Unslung firmware automatically runs at boot. Some other packages are run from -the cron or xinetd daemons. - -You can also check the ipkg command arguments simply by typing "ipkg" at the -prompt. - - -DIVERSION SCRIPTS - -Diversion scripts are used to start packages, set variables or function -definitions at the time of the NSLU2 boot. The diversion mechanism allows you -to add to, or even replace the Linksys script functionality. They "divert" the -normal boot scripts to perform the needed action(s) and then can either "return -1" to continue normal factory script progress or "return 0" to abort the -diverted factory script. The diversion of startup scripts is done at the -lowest granularity, so you can just divert the rc.xinetd script and leave all -others unchanged. You are advised to use diversion scripts rather than editing -system files directly (as this will allow you to upgrade the Unslung firmware -in the future without having to make all of your changes again). - - - Note: If you do need to edit the system files directly, you can use the - "resling" script to save and load your modified system files. See - the NSLU2-Linux wiki at: - - http://www.nslu2-linux.org/wiki/Unslung/ReSling - -Diversion scripts go in the /unslung directory (you may have to create that -directory first). Note that after you have unslung to an external disk, then -the diversion scripts will be stored on that external disk (along with the rest -of the root filesystem). This means that recovering from an incorrect -diversion script is as simple as powering off, unplugging the disk, powering -on, hot-plugging the disk (note that the diversion scripts will only run if the -disk is attached at boot), and fix or remove the diversion script. - -You may divert as many or as few scripts as you like. Simply add the name of -the standard rc script into the appropriate /unslung directory and it will be -run. - -For example, I have a script /unslung/rc.local: - -#! /bin/sh -/opt/bin/do_foo -return 1 - -That will run at the beginning of the normal /etc/rc.d/rc.local, and then -the rest of the factory rc.local will be executed. If I do NOT want to run -the factory rc.local, my script would be: - -#!/bin/sh -/opt/bin/do_foo -return 0 - -That is, if the diversion script returns with something other than 0, it will -run the rest of the factory script. - -Note that any variable definitions or function declarations are allowed to -happen before the diversion script is called. This allows you to use the -variables and functions defined by the factory script. - -Also not that telnet is not enabled by default - there is an openssh package -and a dropbear package that either can replace telnet access with secure shell -access. - -OpenSSH is the simplest to install: - - - OpenSSH package details on NSLU2-Linux wiki at: - http://www.nslu2-linux.org/wiki/HowTo/UseOpenSSHForRemoteAccess - -Dropbear is preferred by some: - - - Dropbear package details on NSLU2-Linux wiki at: - http://www.nslu2-linux.org/wiki/HowTo/UseDropBearForRemoteAccess - -The rationale behind not enabling telnet by default is ensure that an Unslung -NSLU2 has the same network footprint as a stock NSLU2 with Linksys firmware. -That said, if you want to enable telnet on boot, then install the xinetd -package (which enables telnet by default). - - -CHANGELOG - -1.11: - -First public release - -1.12: - -Added a symlink to slingbox for gzip. Added flashfs (as simple utility for -preserving user files across hard disk formats during beta testing). - -1.13: - -Added LD_LIBRARY_PATH to /etc/profile (only works for telnet and ssh access, -not for serial or diversion scripts). - -1.14: - -Added Unslung Doc link to the User Guide page. - -2.3: - -Moved development to OpenEmbedded. - -2.4: - -Updated to the latest ipk binary instead of the simple script. - -2.5: - -Added the real wget (instead of using the busybox version). This is so we can -support .netrc files for commercial packages. - -2.6: - -Fixed the unsling script so it removes conflicting files on an upgrade. - -2.7: - -Began development of the -able variant. - -2.8: - -Added the patch for genesys enclosures. - -2.9: - -Reorganized the various variants into a more consistent scheme. - -2.10: - -Added the ext3flash-on-disk1 functionality. - -2.11: - -Added the README to /opt/doc. - -2.12: - -First public release of 2.x firmware. - -3.1: - -Added jffs2 functionality. - -3.2: - -Incorporated switchbox functionality. - -3.3: - -Added ramdisks for /dev and /var to reduce internal flash writes. - -3.4: - -Replaced flashfs script with new resling script. - -3.5: - -Added code to reinitialize /etc/mtab on boot. - -3.6: - -Mounted /dev and /var jffs2 directories as /dev.state and /var.state so that -they can be used for persistent changes which are used to populate the ramdisks -on the next boot. - -3.7: - -Added "Pluggable Personalities" - now runs diversion scripts from both the -internal jffs2 area and also from an external drive attached at boot time. - -3.8: - -Enabled mounting of external drives earlier in the boot process, so that the -rc, rc.sysinit, and rc.1 scripts can be diverted by external diversion scripts -on an attached drive. - -3.9: - -Moved a number of -able kernel features (such as USB devfs support) into --standard. - -3.10: - -Added support for unslung-start and unslung-stop diversion scripts, and package -shutdown scripts (K??foo). - -3.11: - -Added NFS kernel support (both client and server, and both V2 and V3 -protocols). - -3.12: - -Added basic maintenance mode support. If /.ramdisk exists in the jffs2 -filesystem, then the jffs2 filesystem is copied into a ramdisk on boot, and run -from there. This allows for updating firmware using the web interface. - -3.13: - -Added recovery mode support. If a viable root filesystem cannot be found, then -switchbox drops into a basic recovery shell, with a telnet daemon running as -192.168.1.77 with no password. This behavior can also be forced with a -/.recovery file in the jffs2 filesystem. - -3.14: - -Added web control of maintenance mode. You have to enable maintenance mode and -reboot before the firmware upgrade page allows you to enter a filename for the -new firmware. - -3.15: - -Added confirmation dialog boxes to the maintenance mode web control. - -3.16: - -First public release of 3.x firmware. - -3.17: - -Fixed syslog issue. Added FP patches. - -3.18: - -Fixed a number of minor issues regarding file permissions. -Added support for unslinging to the data partition. - -4.1: - -Split from 3.x stream to allow parallel development. - -4.2: - -New switchbox implementation with NFS and external USB disk root filesystem -support. - -4.3: - -Enabled devfs. - -4.4: - -Changed slingbox program locations to match those of OpenSlug so that -we can use the same switchbox for both. - -4.5: - -Enabled RAID support modules and USB camera support modules. - -4.6: - -Merged unslung-standard and unslung-able, and created the oe feed for -downloadable kernel modules. Updated the unsling script to support -external rootfs. - -4.7: - -Enabled lots of traffic shaping modules. Enabled support for external -disks on sda1, sda2, sdb1 and sdb2. - -4.8: - -Made Unslung *not* create ramdisk for /var and /dev when you've -unslung to an external disk. Fixed nsswitch.conf. Updated the feed -locations. Added /dev/st devices for tape drive support. - -4.9: - -Updated the unslung script to give feedback on the rootfs transfer, -and to preserve an existing upkg database on the target disk. Added -more device nodes to support the new downloadable kernel modules. - -4.10: - -Made Unslung wait until quota checking is complete before running -package startup scripts. Simplified unsling to support disk1 and -disk2 (data partitions) only. - -4.11: - -Removed /tmp ramdisk if unslung to an external disk. Now clears /tmp -and /mnt/backup on each boot. - -4.12: - -Updated to the latest ipkg version. - -4.13: - -Added /dev/sdd and /dev/sde device nodes. -Added support for alternate rootfs under expert user control. - -4.14: - -Added audio support to the kernel. Increased the USB disk startup -wait to 10 seconds, and added the ability to divert rc.bootbin to the -startup scripts. - -4.15: - -Added /dev/dsp and updated the README and NOTES files. - -4.16: - -Added the /sbin/slingover script for migrating packages from the 3.x locations. - -4.17: - -Developer-only release booting straight from jffs2 instead of using switchbox. - -4.18: - -A number of /linuxrc fixes. Removed support for alternate rootfs under expert -user control (expert users can now just edit the /linuxrc in jffs2 directly). - -4.19: - -Removed all trace of switchbox from the firmware. This saves 128Kb of flash, -and about 1MB of RAM. - -4.20: - -First public release of 4.x firmware. - -5.1: - -Upgraded to Linksys firmware V2.3R29, but kept telnetd. - -5.2: - -Removed the ipkg link, and made unsling put it back on an external disk. - -5.3: - -Replaced maintenance mode with code to allow entry into RedBoot Upgrade Mode. - -5.4: - -Removed all maintenance mode support, and also removed support for rootfs on -jffs2 but packages on external disk (it's either all or nothing). -Removed unused /mnt/sda1, /mnt/sda2, /mnt/sdb1, and /mnt/sdb2. -Disabled the download process (superceded by upgrade mode). -Disabled the generation of the "ourtelnetrescue" user (too insecure). -Added disk auto-wait countdown to /linuxrc (courtesy of glc). - -5.5: - -First public release of 5.x firmware. - -6.0: - -First alpha release of 6.x Unslung firmware, based on Linksys V2.3R63 firmware. - -6.5: - -Unsling script now prompts for a root password to be used, additional sanity -checks added to minimize the chance of an improper unsling. User feedback -added to indicate the status (running from internal flash or booted up from -an external drive) via /etc/motd, ipkg, as well as the main web page. Improved -diagnostic messages from unsling. Added the Linksys custom code to the "mount" -code in the slingbox version of mount. - -6.6: - -Changed the code that handles the ".ext3flash" functionality so that it can -handle booting from either /dev/sda or /dev/sdb. -Cleanup of the "telnet.htm" management page. -Unsling now creates the wmtp and utmp files. -Unsling now "edits" the .../conf/passwd file instead of replacing it. -Ipkg dependencies fixed so that kernel-modules no longer need "force-install". -Support for loopback mounting ISO images (loop.o and isofs.o are now created). -The keyspan.o USB serial kernel-module is also created at build time. -README file updated to reflect the new unsling script as well as the -change in preferred port for the primary external disk. - -6.7: - -Added original "netconsole" code as a kernel module -Fixed problem with password changing from the GUI and automatic mounting of -drives and flash devices in port 1. -Remove unnecessary directory /lib/modules/2.4.22-xfs/pcmcia. - -6.8: - -First beta release. - -6.9: - -Modified /etc/rc.d/rc.modules to "insmod" any nls code page modules present. - -Code Page 850 is now compiled into the kernel instead of a kernel module, -and added Code Page 949 (as a module). - -Updated the upgrade.htm file to reflect redboot as the upgrade means. - -Remove the upgrade.cgi, upgrade_ui.htm, and upgrade_ui.cgi files from the -root image as they are no longer used, and we can always use free space. - -Rearranged portions of the build procedure to remove the samba code pages in -the rootfs bb, create a new package with the removed code pages in a new -nslu2-linksys-sambacodepages.bb file (to restore the code pages, use ipkg to -install package "nslu2-linksys-sambacodepages". Note that the rootfs and the -sambacodepages bb files must be kept in sync regarding the samba code pages -that are left in the image and the ones that are added to the package (and it -is also a good idea if the kernel defconfig reflects the inclusion of NLS -support for the code pages that are left in the image, of course). - -Fixed ppp-mppe.c to remove unresolved symbols when loading module. - -Disable the ourtelnetrescueuser account in the passwd file entirely since -Unslung doesn't need it anymore. - -Include losetup with slingbox (so we have losetup in the firmware). - -Fix extraneous boot messages from jffs2 filesystem driver (change options -used when building the flash jffs image). - -Added pl2303.c patch for TIOCMGET/MSET/MBIS/MBIC. -Syntax fixes in prep for newer busybox: - - comments in rc.samba, "cp" in rc.sysinit - -Flash filesystem cleanup (regained space): - - replaced dupl 'date' utility with symlink, corrected 'killall' symlink - - removed 'mt', 'libexec', 'locate', 'xargs', 'updatedb' from flash - (TODO: strip ipkg database entries out for 'findutils' and 'cpio') - - adjusted 'unsling' to use common 'find' options (hope to replace soon) - -Upgraded slingbox to v1.1.3 busybox base; enabled 'more' command -(note: upgrade added 3KB in size, 'more' added 4KB in size) - -Added network console debugging support: - - patched netconsole driver, added netconsole kernel module to image - - updated /linuxrc (& misc files) for basic support of same - -Added ".nodisk" flag -- presence of the ".nodisk" file on the flash root -will force a one-time-only boot to flash. This makes for easier testing and -maintenance; easier than plugging and unplugging disks. - -Empty the /etc/win_share.info file on boot (fixes problem with multiple -identical shares appearing on a system). - -Upgraded slingbox to v1.2.2 busybox base; enabled fdisk. - -Replaced Linksys busybox with slingbox entirely. - -Modified "unsling" script to use tar instead of find and cpio; removed -obsolete and untested unsling utilities (eg: resling). - -Replace mkfs.ext3 with a script in order to fix an obscure formatting bug -with the Linksys GUI. - -Increased the bootup delay from 5 seconds to 15 seconds in linuxrc; -required by some large disks which require additional time to become ready. -Touching "/.fastdisk" on the flash filesystem will revert to the original -5 second delay, which is useful to retain reasonably boot times. - -Added the bootdisk mechanism: at initial boot time, partitions mounted -on the HDD mountpoints are scanned for a special directory structure -containing startup script, which are executed. This facilitates easy -customization of the boot for debugging purposes, or even automated -installation and configuration processes. - -6.10: - -Second beta release. diff --git a/recipes/nslu2-binary-only/unslung-rootfs/README b/recipes/nslu2-binary-only/unslung-rootfs/README deleted file mode 100644 index b5f5a23190..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/README +++ /dev/null @@ -1,177 +0,0 @@ - Unslung-6.10 README - -If at any time you have any questions concerning the installation or operation -of Unslung firmware, your first port of call should be the NSLU2-Linux wiki at: - - http://www.nslu2-linux.org - -Additional information, including ChangeLog information can be found in the -associated Unslung NOTES file as well as on the NSLU2-Linux wiki. - -------------------------------------------------------------------------------- - -There are three parts to completing the installation of the Unslung firmware: - - 1 - PRE-INSTALLATION CONSIDERATIONS - 2 - FIRMWARE INSTALLATION DETAILS - 3 - UNSLINGING DETAILS - -1) PRE-INSTALLATION CONSIDERATIONS - -a) You *must* confirm that you can enter "upgrade mode" using the Reset Button -method. This is necessary because once you install Unslung, you will be unable -to use the web GUI to reflash the device; the Reset Button technique will be -required to install new firmware, upgrade, or recover from a bad flash: - - http://www.nslu2-linux.org/wiki/HowTo/UseTheResetButtonToEnterUpgradeMode - -To upload the firmware, use either the Sercomm Update Utility (for Windows -users) or the UpSlug2 Utility (for Linux and MacOS X users): - - http://www.nslu2-linux.org/wiki/Main/SercommFirmwareUpdater - http://www.nslu2-linux.org/wiki/Main/UpSlug2 - http://www.nslu2-linux.org/wiki/Main/UpSlug2onOSX - -b) You must have an external USB disk drive or an external USB flash device. -There are a number of considerations to take into account in selecting the size -and type of external device as well as which of the two USB ports to use: - - http://www.nslu2-linux.org/wiki/Unslung/StorageBasics - http://www.nslu2-linux.org/wiki/Unslung/WhichUSBPortforUnslung6 - -It is important to make sure that the device you intend to use is functional -with the standard Linksys firmware before you attempt to use it with Unslung. - -c) Review any known issues and errata: - - http://www.nslu2-linux.org/wiki/Unslung/KnownProblems - -(Hint: read the wiki pages carefully to determine the firmware release to which -they apply; many of the pages contain information pertaining to older versions -of Unslung, or even to other firmware entirely.) - -2) FIRMWARE INSTALLATION DETAILS - -The installation process is simple, but each step is important. The most -common problems reported are a result of skipping one of the steps in this -process, so be careful. In particular, having a disk or flash device plugged -in when it shouldn't be can mean the difference between success and failure. - -a) Preparation - -- Install either the Sercomm (Windows) or the UpSlug2 (Linux and MacOS X) - utilities on the system you'll be using to upload the firmware. - -- Access the Linksys web GUI, and record your network settings. - -- Shutdown the NSLU2 and unplug all USB cables and devices. - -b) Flashing the New Firmware - -- Enter upgrade mode, using the Reset Button technique. - -- Use either the Sercomm or UpSlug2 Utility to upload the new firmware. - -c) Verifying the New Firmware - -- The NSLU2 will restart itself after the firmware in installed. - -- Access the Linksys web GUI. The new firmware version will be displayed on - the "Home" screen. - -3) 'UNSLINGING' DETAILS - -"Unslinging" is the process of copying the firmware to an external disk, and -configuring that external disk for installation of packages. In order to -perform this operation, you need to log in to the NSLU2 using telnet, and you -need a suitable external disk or flash device. - -This procedure is made a bit more complicated because the behavior of the NSLU2 -can change depending on the presence of an external disk. Specifically, when -an external storage device is plugged in, the NSLU2 will switch over to using -the passwords and configuration information stored on that external disk, if -possible. Since we don't know the root password originally written to that -device, you must be very careful to perform the following steps in precisely -the specified order, or you'll lock yourself out of your own device. - -a) Gain Telnet Access - -- Power up the NSLU2 without any disks connected. - -- Enable telnet by going to the NSLU2's web GUI and clicking on the "Manage - Telnet" link (right-hand side), then on the "Enable" button to turn on the - telnet service. - -- Use your telnet utility to telnet into the NSLU2, and log in using the - username root and password uNSLUng (upper/lower case is significant). - -- Do not logout before you go to the next step, or you'll have to start this - step over again. - -b) Gain Access to the External Storage - -- Identify the drive or flash device to which you will be unslinging, and plug - it in to the desired USB port. - -- Wait for a minute or two while the disk is mounted. - -- Check the web GUI to make sure that the disk has been recognized by the - Linksys software - -- If the disk has not been previously formatted on the NSLU2, then now is the - time to do that. - -- Be patient - it might take several minutes for the NSLU2 to recognize the - hardware, mount the partitions, and verify that the drive is correctly - configured to be considered "Formatted". - -- Do not continue if the drive is not marked as "Formatted (ext3)" in the - NSLU2 web GUI. - -c) Unsling - -- In the telnet session, run "unsling disk2" if your device is on the USB port - labeled "DISK 2", or "unsling disk1" if it's on the port marked "DISK 1". - -- When prompted, enter a new root password - this password will replace the - uNSLUng password. - -- When the unsling is complete, reboot the NSLU2. - -d) Confirm That Your NSLU2 is Unslung: - -- Once rebooted, open the NSLU2 web GUI in your browser. - -- Confirm that the text at the bottom of the page reads "uNSLUng status: - Unslung to disk2, /dev/sda1" (your devices may vary, of course). - -- Click the "Manage Telnet" link, and enable telnet as before. - -- Telnet to the NSLU2, and login using the root user and the new password you - gave when unslinging. - -- Confirm that the login message states that you are running in Unslung mode. - -e) Updating Package Lists and Installing Optware Packages - -(This is, strictly speaking, optional - but we expect that you installed this -firmware so that you could add additional software.) - -- Telnet into the NSLU2. - -- Check that your NSLU2 can reach the internet by pinging www.nslu2-linux.org. - (if it fails, check your NSLU2 network settings (on the web GUI pages), or - check your router or network configuration to correct this problem.) - -- Enter the command "ipkg update" to update the list of software packages - ("optware") available for Unslung. - -- Install the "openssh" package with the command "ipkg install openssh". - -------------------------------------------------------------------------------- - -Congratulations! Your NSLU2 is unslung, and ready to do more than you'd -imagine such a small device could ever do. Enjoy! If you find the Unslung -firmware useful, you may wish to make a donation to help support the project: - - http://www.nslu2-linux.org/wiki/Main/Donate diff --git a/recipes/nslu2-binary-only/unslung-rootfs/create-ramdisks.patch b/recipes/nslu2-binary-only/unslung-rootfs/create-ramdisks.patch deleted file mode 100644 index 5ba8bc6607..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/create-ramdisks.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit.orig 2004-11-09 21:45:46.000000000 +1030 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit 2004-11-09 21:41:47.000000000 +1030 -@@ -13,7 +13,25 @@ - - mkdir -p /var/lock/samba >/dev/null --/bin/echo "Creating ramfs for /var/lock/samba:"; mount -t ramfs none /var/lock/samba -o maxsize=64 --/bin/echo "Limit the space of log folder:"; mount -t ramfs none /var/log -o maxsize=128 -+ -+if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then -+ /bin/echo "Creating ramfs for /dev:" -+ /bin/mount -t ramfs ramfs /mnt/tmpmnt -+ /bin/cp -rp /dev/* /mnt/tmpmnt/ -+ /bin/mkdir -p /dev.state -+ /bin/mount -o bind /dev /dev.state -+ /bin/mount -o bind /mnt/tmpmnt /dev -+ /bin/umount /mnt/tmpmnt -+ /bin/echo "Creating ramfs for /var:" -+ /bin/mount -t ramfs ramfs /mnt/tmpmnt -o maxsize=256 -+ /bin/cp -rp /var/* /mnt/tmpmnt/ -+ /bin/mkdir -p /var.state -+ /bin/mount -o bind /var /var.state -+ /bin/mount -o bind /mnt/tmpmnt /var -+ /bin/umount /mnt/tmpmnt -+ /bin/killall syslogd -+ /bin/killall klogd -+fi -+ - mkdir -p /var/log/samba >/dev/null - touch /var/log/server.log >/dev/null - chmod 755 /var/log/samba >/dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/initialise-mtab.patch b/recipes/nslu2-binary-only/unslung-rootfs/initialise-mtab.patch deleted file mode 100644 index fb4e1982f2..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/initialise-mtab.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc~ 2004-11-21 21:43:35.000000000 +1030 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc 2004-11-21 21:49:54.000000000 +1030 -@@ -6,2 +6,5 @@ - mount -t proc proc /proc - mount -o remount,rw /dev/root / -+ -+sed -n -e '/^#/p' < /etc/fstab > /etc/mtab -+ diff --git a/recipes/nslu2-binary-only/unslung-rootfs/ipkg-fl b/recipes/nslu2-binary-only/unslung-rootfs/ipkg-fl deleted file mode 100755 index ade959a759..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/ipkg-fl +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/sh -echo -echo "Error: The ipkg command cannot currently be used because this" -echo "system is running from its internal flash; it is not currently" -echo "\"unslung\" to an external disk or flash device." -echo -echo "Please complete the process of \"unslinging\" this system, or" -echo "resolve the issues that did not permit it to boot from the" -echo "external device before installing any ipkg packages or updates." -echo -exit 1 diff --git a/recipes/nslu2-binary-only/unslung-rootfs/linuxrc b/recipes/nslu2-binary-only/unslung-rootfs/linuxrc deleted file mode 100755 index 1500779280..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/linuxrc +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -NC_SLUGIP="192.168.1.77" -NC_TARGIP="192.168.1.100" - -if ( [ -f "/.nc" ] ) ; then - if ( [ -z "$RERUN" ] ) ; then - /bin/echo " DEBUG: Starting network console from flash ..." - . /.nc - /bin/echo "Insmod ixp400" - /sbin/insmod ixp400.o - /bin/echo "Insmod ixp425" - /sbin/insmod ixp425_eth.o - /sbin/ifconfig ixp0 $NC_SLUGIP - /bin/echo "Insmod netconsole" - /sbin/insmod netconsole.o target_ipaddr=$NC_TARGIP - /bin/echo "Redirecting output via nc and restarting /linuxrc ..." - export RERUN=1 - exec /linuxrc 2>&1 | tee /dev/console | /usr/bin/nc $NC_TARGIP 6666 - fi -fi - -# **** DO NOT EVEN THINK OF EDITING OR REMOVING THIS FILE **** -# **** UNLESS YOU REALLY KNOW *EXACTLY* WHAT YOU ARE DOING. **** - - -# Perform prepatory tasks, and determine whether an alternate rootfs is viable. - -/bin/mount -t proc proc /proc - -/bin/echo "1" > /proc/sys/kernel/panic - -if ( ! [ -f /.nodisk ] ) ; then - - /bin/echo "Sleeping while waiting for disk..." - cnt=20 - while [ $cnt -gt 0 ] ; do - /bin/echo -ne "\r$cnt " - /bin/sleep 1 - [ -e /.sda1root -a -f /proc/hdd_sda ] && cnt=0 - [ -e /.sdb1root -a -f /proc/hdd_sdb ] && cnt=0 - cnt=`expr $cnt - 1` - done - /bin/echo - - if [ -e /.fastdisk ] ; then - /bin/sleep 5 - else - /bin/sleep 15 - fi - - mounted= - - for prefroot in sda1 sdb1 ; do - if [ -z "$mounted" -a -e /.${prefroot}root ] ; then - if /bin/mount -rt ext3 /dev/$prefroot /mnt ; then - if [ -e /mnt/.${prefroot}root -a -x /mnt/bin/init ] ; then - /bin/echo "Root filesystem will be mounted from /dev/$prefroot ..." - mounted=/mnt - else - /bin/umount /mnt - /bin/echo "Can't find valid rootfs on /dev/$prefroot ..." - fi - fi - fi - done - - if [ -z "$mounted" ] ; then - /bin/echo "Can't find valid rootfs, using ramdisk ..." - mounted= - fi - - /bin/umount /proc - - # Pivot to the desired rootfs and run the initial executable. - - if [ -n "$mounted" ] ; then - - cd $mounted - - /bin/echo "Pivoting to external rootfs ..." - /sbin/pivot_root . initrd - - if ( [ -z "$RERUN" ] ) ; then - exec /usr/sbin/chroot . /bin/init < /dev/console 1> /dev/console 2> /dev/console - else - exec /usr/sbin/chroot . /bin/init - fi - else - - exec /bin/init - - fi - - /bin/echo "Can't pivot to external rootfs, using ramdisk ..." - -else - /bin/echo "Forced boot to internal flash ..." - /bin/echo "(One-time only, clearing forced boot flag file.)" - /bin/rm -f /.nodisk -fi - -exec /bin/init - -# Last-resort fall-back - this should never be reached. -/bin/sh diff --git a/recipes/nslu2-binary-only/unslung-rootfs/mkfs.ext3 b/recipes/nslu2-binary-only/unslung-rootfs/mkfs.ext3 deleted file mode 100755 index 49a88c0e06..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/mkfs.ext3 +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# Fix obscure problem - redirect stdout iff mkfs.ext3 -# is being invoked by the Linksys GUI format utility. -# -u=`/bin/pidof utility.cgi` -if [ ! -f "/tmp/Preparing" -o "x${u}" = "x" -o \ - "y${1}" != "y-m" -o "z${2}" != "z1" ] -then - /usr/bin/mke2fs -j $@ -else - /usr/bin/mke2fs -j $@ >/tmp/mkfs.$$.log -fi diff --git a/recipes/nslu2-binary-only/unslung-rootfs/motd-fl b/recipes/nslu2-binary-only/unslung-rootfs/motd-fl deleted file mode 100644 index aafcd21cb5..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/motd-fl +++ /dev/null @@ -1,11 +0,0 @@ - -Welcome to Unslung @v@ - - -------- NOTE: RUNNING FROM INTERNAL FLASH -------- - -This system is currently running from the internal flash memory, -it has NOT booted up into "unslung" mode from an external drive. - -In this mode, very few services are running, and available disk -space is extremely limited. This mode is normally only used -for initial installation, and system maintenance and recovery. diff --git a/recipes/nslu2-binary-only/unslung-rootfs/motd-un b/recipes/nslu2-binary-only/unslung-rootfs/motd-un deleted file mode 100644 index 5439b08be6..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/motd-un +++ /dev/null @@ -1,4 +0,0 @@ - -Welcome to Unslung @v@ - - ---------- NOTE: THIS SYSTEM IS CURRENTLY UNSLUNG ---------- diff --git a/recipes/nslu2-binary-only/unslung-rootfs/mount_usbdevfs.patch b/recipes/nslu2-binary-only/unslung-rootfs/mount_usbdevfs.patch deleted file mode 100644 index 744636d0d9..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/mount_usbdevfs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.orig 2004-11-03 14:38:45.838082343 +1100 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc 2004-11-03 16:27:08.572763797 +1100 -@@ -4,6 +4,7 @@ - - /usr/bin/Set_Led r_blinking & - mount -t proc proc /proc -+mount -t usbdevfs usbdevfs /proc/bus/usb - mount -o remount,rw /dev/root / - ifconfig lo 127.0.0.1 - route add -net 127.0.0.0 netmask 255.255.255.0 lo diff --git a/recipes/nslu2-binary-only/unslung-rootfs/nsswitch.conf b/recipes/nslu2-binary-only/unslung-rootfs/nsswitch.conf deleted file mode 100644 index 4e0692b4f9..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/nsswitch.conf +++ /dev/null @@ -1,6 +0,0 @@ -passwd: files -group: files -hosts: files dns -networks: files dns -services: files -protocols: files diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc-diversion.patch deleted file mode 100644 index 34e1e795cf..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc~ 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc 2004-09-01 21:47:47.000000000 -0400 -@@ -1,4 +1,7 @@ - ## Simple beta script to verify csr -+ -+if ( [ -f /unslung/rc ] && . /unslung/rc ) ; then return 0 ; fi -+ - /usr/bin/Set_Led r_blinking & - mount -t proc proc /proc - mount -o remount,rw /dev/root / diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.1-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.1-diversion.patch deleted file mode 100644 index d0d769931c..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.1-diversion.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1~ 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1 2004-09-01 21:56:17.000000000 -0400 -@@ -1,5 +1,7 @@ - #!/bin/sh - -+if ( [ -f /unslung/rc.1 ] && . /unslung/rc.1 ) ; then return 0 ; fi -+ - #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04 - /bin/echo "Starting Set CGI_ds.conf:"; /etc/rc.d/rc.bootbin; check_status - -@@ -17,6 +19,8 @@ - /bin/echo "Starting Crond :"; . /etc/rc.d/rc.crond - /bin/echo "Starting Rest Task :"; . /etc/rc.d/rc.local - -+/bin/echo "Starting Optware Packages:"; ( . /etc/rc.d/rc.optware-start ) -+/bin/echo "Starting Bootdisk scripts:"; ( . /etc/rc.d/rc.bootdisk ) - /usr/bin/Set_Led ready - /usr/bin/Set_Led beep1 - /bin/echo "Checking disk status :"; /usr/sbin/CheckDiskFull 2 >/dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.1-timestamp.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.1-timestamp.patch deleted file mode 100644 index c0034b27ab..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.1-timestamp.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.1~ 2006-07-10 19:48:11.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.1 2006-07-10 19:48:24.000000000 -0500 -@@ -45,3 +45,5 @@ - /usr/bin/Set_Led ready - /usr/bin/Set_Led beep1 - /bin/echo "Checking disk status :"; /usr/sbin/CheckDiskFull 2 >/dev/null -+/bin/sleep 5 -+/bin/date diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.bootbin b/recipes/nslu2-binary-only/unslung-rootfs/rc.bootbin deleted file mode 100755 index 42959e8b80..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.bootbin +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if ( [ -f /unslung/rc.bootbin ] && . /unslung/rc.bootbin ) ; then return 0 ; fi - -/sbin/rc.bootbin - -return 0
\ No newline at end of file diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.bootdisk b/recipes/nslu2-binary-only/unslung-rootfs/rc.bootdisk deleted file mode 100755 index c83881a333..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.bootdisk +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh - -# If the nobootdisk flag is set, exit. -if ( [ -f /.nobootdisk ] ) ; then return 0 ; fi - -# If we're not booting from flash, exit. -i=`grep "/dev/root / jffs2" /proc/mounts` -if ( [ -z "$i" ] ) ; then return 0 ; fi - -# Establish our identity -linksys_hostname=`grep "^default_server_name=" /etc/CGI_ds.conf | sed s/default_server_name=//` -real_hostname=`hostname` -echo "====> linksys_hostname is $linksys_hostname" -echo "====> real_hostname is $real_hostname" - -# but don't duplicate -if ( [ "$linksys_hostname" = `hostname` ] ) ; then linksys_hostname= ; fi -if ( [ "$real_hostname" = "default" ] ) ; then real_hostname= ; fi - -# Search all FAT/NTFS filesystem in order. -# (heavily borrowed from the rc.start-optware script). - -for i in /share/*/data/HDD_* ; do - - # if the value of i is the string with the wildcards, no match occurred. - if ( [ "$i" = '/share/*/data/HDD_*' ] ) ; then break ; fi - - echo "====> searching $i..." - - # Now check inside directories named for the Linksys hostname, the real - # hostname, and finally the name "default"... - for j in $linksys_hostname $real_hostname "default" ; do - - echo "====> checking $i/bootdisk/$j ..." - if ( [ -d "$i/bootdisk/$j" ] ) ; then - - # We have the correct subdirectory... - for k in "$i/bootdisk/$j"/S??* ; do - - # Bail out if no match in that directory - if ( [ "$k" = "$i/bootdisk/$j"'/S??*' ] ) ; then break ; fi - - echo "====> found $k ..." - [ ! -f "$k" ] && continue - - # Check to see if we need to copy or run in-place.. - nocopy=`grep "^#bootdisk:nocopy" "$k"` - if ( [ -z "$nocopy" ] ) ; then - - # copy and strip the MSDOS-style line endings, then execute. - echo "====> running copy: /tmp/tmpscript $k $i" - dos2unix -u <"$k" >/tmp/tmpscript - /bin/sh /tmp/tmpscript "$k" "$i" - rm -f /tmp/tmpscript - - else - - # execute in place - echo "====> running in-place $k $k $i" - /bin/sh "$k" "$k" "$i" - - fi - - done - - fi - - done - -done diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.crond-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.crond-diversion.patch deleted file mode 100644 index c770b2ac83..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.crond-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.crond.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.crond 2004-09-01 21:56:37.000000000 -0400 -@@ -1,5 +1,7 @@ - #!/bin/sh - -+if ( [ -r /unslung/rc.crond ] && . /unslung/rc.crond ) ; then return 0 ; fi -+ - if [ -n "`pidof crond`" ] ;then - /bin/killall crond 2>/dev/null - fi diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.halt-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.halt-diversion.patch deleted file mode 100644 index 3702c3d137..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.halt-diversion.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.halt.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.halt 2004-09-01 21:57:01.000000000 -0400 -@@ -1,4 +1,9 @@ - #!/bin/sh -+ -+if ( [ -r /unslung/rc.halt ] && . /unslung/rc.halt ) ; then return 0 ; fi -+ -+/bin/echo "Stopping Optware Packages:"; ( . /etc/rc.d/rc.optware-stop ) -+ - /bin/killall -2 upnpd &>/dev/null - /bin/killall nmbd &>/dev/null - /bin/killall smbd &>/dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.lan-shell.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.lan-shell.patch deleted file mode 100644 index 5d25788fdf..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.lan-shell.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.lan.orig 2006-11-10 20:07:27.000000000 -0600 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.lan 2006-11-10 20:07:35.000000000 -0600 -@@ -1,3 +1,3 @@ --#!/bin/bash -+#!/bin/sh - #echo "set network driver to operate in auto-sense mode" - #/sbin/insmod /lib/modules/sk98lin.o diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.local-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.local-diversion.patch deleted file mode 100644 index 335dc85835..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.local-diversion.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local 2004-09-01 21:57:17.000000000 -0400 -@@ -1,5 +1,9 @@ - #!/bin/sh -+ - HOSTNAME=`hostname` -+ -+if ( [ -r /unslung/rc.local ] && . /unslung/rc.local ) ; then return 0 ; fi -+ - /usr/sbin/CheckResetButton 2>/dev/null - /usr/sbin/CheckPowerButton 2>/dev/null - /usr/sbin/do_umount 2>/dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch deleted file mode 100644 index d1de027f9a..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules.orig 2006-04-14 21:00:58.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules 2006-04-14 21:05:47.000000000 -0500 -@@ -1,4 +1,7 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.modules ] && . /unslung/rc.modules ) ; then return 0 ; fi -+ - insmod pbuttons 2>/dev/null - insmod rbuttons 2>/dev/null - insmod x1226-rtc 2>/dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch deleted file mode 100644 index 1eb342b715..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules.orig 2006-04-14 21:05:47.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules 2006-04-14 19:56:29.000000000 -0500 -@@ -6,3 +6,7 @@ - insmod rbuttons 2>/dev/null - insmod x1226-rtc 2>/dev/null - insmod ufsd 2>/dev/null -+ -+for i in /lib/modules/`/bin/uname -r`/kernel/fs/nls/nls_cp*.o ; do -+ insmod "$i" 2>/dev/null -+done diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.network-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.network-diversion.patch deleted file mode 100644 index 0cb2a66666..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.network-diversion.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.network.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.network 2004-09-01 21:57:46.000000000 -0400 -@@ -1,3 +1,6 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.network ] && . /unslung/rc.network ) ; then return 0 ; fi -+ - /sbin/ifup; #check_status - /bin/echo "call rc.network!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.optware-start b/recipes/nslu2-binary-only/unslung-rootfs/rc.optware-start deleted file mode 100755 index 53fe7e8262..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.optware-start +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -if ( [ -f /unslung/rc.optware-start ] && . /unslung/rc.optware-start ) ; then return 0 ; fi - -# Start all init scripts in /opt/etc/init.d -# executing them in numerical order. -# -for i in /opt/etc/init.d/S??* ;do - - # Ignore dangling symlinks (if any). - [ ! -f "$i" ] && continue - - case "$i" in - *.sh) - # Source shell script for speed. - ( - trap - INT QUIT TSTP - set start - . $i - ) - ;; - *) - # No sh extension, so fork subprocess. - $i start - ;; - esac -done diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.optware-stop b/recipes/nslu2-binary-only/unslung-rootfs/rc.optware-stop deleted file mode 100755 index 3668aaf351..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.optware-stop +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -if ( [ -f /unslung/rc.optware-stop ] && . /unslung/rc.optware-stop ) ; then return 0 ; fi - -# Stop all init scripts in /opt/etc/init.d -# executing them in numerical order. -# -for i in /opt/etc/init.d/K??* ;do - - # Ignore dangling symlinks (if any). - [ ! -f "$i" ] && continue - - case "$i" in - *.sh) - # Source shell script for speed. - ( - trap - INT QUIT TSTP - set stop - . $i - ) - ;; - *) - # No sh extension, so fork subprocess. - $i stop - ;; - esac -done diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.quickset-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.quickset-diversion.patch deleted file mode 100644 index df6534daca..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.quickset-diversion.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quickset.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quickset 2004-09-01 21:57:57.000000000 -0400 -@@ -1,3 +1,6 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.quickset ] && . /unslung/rc.quickset ) ; then return 0 ; fi -+ - /usr/sbin/QuickSet; check_status - /usr/sbin/USB_Detect; check_status diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.quota-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.quota-diversion.patch deleted file mode 100644 index 288ef1929c..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.quota-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota 2004-09-01 21:58:08.000000000 -0400 -@@ -1,5 +1,7 @@ - #!/bin/sh - -+if ( [ -f /unslung/rc.quota ] && . /unslung/rc.quota ) ; then return 0 ; fi -+ - # Check and turn on disk quota. - if [ -x "/usr/bin/quotacheck" ] - then diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.reboot-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.reboot-diversion.patch deleted file mode 100644 index 3e73b941c1..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.reboot-diversion.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reboot.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reboot 2004-09-01 21:58:19.000000000 -0400 -@@ -1,4 +1,9 @@ - #!/bin/sh -+ -+if ( [ -r /unslung/rc.reboot ] && . /unslung/rc.reboot ) ; then return 0 ; fi -+ -+/bin/echo "Stopping Optware Packages:"; ( . /etc/rc.d/rc.optware-stop ) -+ - /bin/killall -2 upnpd 2>/dev/null - sleep 4 - /sbin/ifdown ixp0 diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.reset_usrgrpshare-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.reset_usrgrpshare-diversion.patch deleted file mode 100644 index c01804bb68..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.reset_usrgrpshare-diversion.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reset_usrgrpshare.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reset_usrgrpshare 2004-09-01 21:58:36.000000000 -0400 -@@ -1,2 +1,5 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.reset_usrgrpshare ] && . /unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi -+ - /usr/sbin/reset_ugs; diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.rstimezone-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.rstimezone-diversion.patch deleted file mode 100644 index 19b020fcbc..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.rstimezone-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.rstimezone.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.rstimezone 2004-09-01 21:58:47.000000000 -0400 -@@ -1,4 +1,7 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.rstimezone ] && . /unslung/rc.rstimezone ) ; then return 0 ; fi -+ - #TIME=`/usr/sbin/hwclock` - /usr/sbin/Set_TimeZone >/dev/null - #/bin/date -s "$TIME" diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.samba-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.samba-diversion.patch deleted file mode 100644 index 322aa5fe33..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.samba-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.samba.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.samba 2004-09-01 21:58:57.000000000 -0400 -@@ -1,4 +1,7 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.samba ] && . /unslung/rc.samba ) ; then return 0 ; fi -+ - if [ -n "`pidof smbd`" ] ; then - killall smbd 2>/dev/null - fi diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.samba-syntaxfix.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.samba-syntaxfix.patch deleted file mode 100644 index fcfc273f2b..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.samba-syntaxfix.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.samba~ 2006-05-16 14:22:33.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.samba 2006-05-16 16:47:45.000000000 -0500 -@@ -5,16 +5,16 @@ - if [ -n "`pidof smbd`" ] ; then - killall smbd 2>/dev/null - fi --if [ -n "`pidof smbd`" ] ; then -+#if [ -n "`pidof smbd`" ] ; then - # killall -9 smbd 2>/dev/null --fi -+#fi - - if [ -n "`pidof nmbd`" ] ; then - killall nmbd 2>/dev/null - fi --if [ -n "`pidof nmbd`" ] ; then -+#if [ -n "`pidof nmbd`" ] ; then - # killall -9 nmbd 2>/dev/null --fi -+#fi - sleep 2 - /usr/sbin/smbd -D; - /usr/sbin/nmbd -D; diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-clean_var.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-clean_var.patch deleted file mode 100644 index 17e7ebef43..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-clean_var.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit.orig 2006-03-01 17:55:20.000000000 -0600 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit 2006-03-01 18:25:06.000000000 -0600 -@@ -30,6 +30,19 @@ - mkdir -p /var/log/samba >/dev/null - touch /var/log/server.log >/dev/null - chmod 755 /var/log/samba >/dev/null -+ -+# Clean up /var/lock and /var/run (fixes bug where USB_Detect fails), -+# and empty utmp and wtmp (but do not create them if they don't exist). -+rm -f /var/run/*.pid -+rm -f /var/lock/samba/*.pid -+rm -f /var/lock/ds_diag -+if ( [ -f /var/run/utmp ] ) ; then -+ > /var/run/utmp -+fi -+if ( [ -f /var/log/wtmp ] ) ; then -+ > /var/log/wtmp -+fi -+ - /bin/echo "Starting Hostname :"; hostname ${HOSTNAME}; check_status - #/bin/echo "Starting System Log :"; . /etc/rc.d/rc.syslogd - /bin/echo "Starting Modules :"; . /etc/rc.d/rc.modules diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-cpbug.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-cpbug.patch deleted file mode 100644 index 5b908851ed..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-cpbug.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit~ 2006-05-16 17:35:56.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit 2006-05-16 17:36:10.000000000 -0500 -@@ -11,14 +11,14 @@ - if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then - /bin/echo "Creating ramfs for /dev:" - /bin/mount -t ramfs ramfs /mnt/tmpmnt -- /bin/cp -rp /dev/* /mnt/tmpmnt/ -+ /bin/cp -a /dev/* /mnt/tmpmnt/ - /bin/mkdir -p /dev.state - /bin/mount -o bind /dev /dev.state - /bin/mount -o bind /mnt/tmpmnt /dev - /bin/umount /mnt/tmpmnt - /bin/echo "Creating ramfs for /var:" - /bin/mount -t ramfs ramfs /mnt/tmpmnt -o maxsize=256 -- /bin/cp -rp /var/* /mnt/tmpmnt/ -+ /bin/cp -a /var/* /mnt/tmpmnt/ - /bin/mkdir -p /var.state - /bin/mount -o bind /var /var.state - /bin/mount -o bind /mnt/tmpmnt /var diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-diversion.patch deleted file mode 100644 index c929424457..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-diversion.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit 2004-09-01 21:59:04.000000000 -0400 -@@ -1,7 +1,11 @@ - #!/bin/sh --export PATH=/bin:/sbin:/usr/bin:/usr/sbin -+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin -+ - . /etc/rc.d/rc.functions - . /etc/sysconfig/network -+ -+if ( [ -f /unslung/rc.sysinit ] && . /unslung/rc.sysinit ) ; then return 0 ; fi -+ - mkdir -p /var/lock/samba >/dev/null - /bin/echo "Creating ramfs for /var/lock/samba:"; mount -t ramfs none /var/lock/samba -o maxsize=64 - /bin/echo "Limit the space of log folder:"; mount -t ramfs none /var/log -o maxsize=128 diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch deleted file mode 100644 index 392a294588..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit.orig 2006-07-11 01:36:28.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit 2006-07-11 10:10:29.000000000 -0500 -@@ -43,6 +43,12 @@ - > /var/log/wtmp - fi - -+# Clean up /etc/win_share.info (fixes bug where shares appear -+# multiple times. Do not create the file if it doesn't exist, though. -+if ( [ -f /etc/win_share.info ] ) ; then -+ > /etc/win_share.info -+fi -+ - /bin/echo "Starting Hostname :"; hostname ${HOSTNAME}; check_status - #/bin/echo "Starting System Log :"; . /etc/rc.d/rc.syslogd - /bin/echo "Starting Modules :"; . /etc/rc.d/rc.modules diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.thttpd-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.thttpd-diversion.patch deleted file mode 100644 index 35528ef71e..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.thttpd-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.thttpd.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.thttpd 2004-09-01 21:59:13.000000000 -0400 -@@ -1,4 +1,7 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.thttpd ] && . /unslung/rc.thttpd ) ; then return 0 ; fi -+ - if [ -n "`pidof thttpd`" ] ;then - /bin/killall thttpd 2>/dev/null - fi diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.xinetd-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.xinetd-diversion.patch deleted file mode 100644 index c99ed7c1ec..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.xinetd-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.xinetd.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.xinetd 2004-09-01 21:59:34.000000000 -0400 -@@ -1,4 +1,7 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.xinetd ] && . /unslung/rc.xinetd ) ; then return 0 ; fi -+ - if [ -n "`pidof inetd`" ] ;then - killall inetd 2>/dev/null - # killall -9 inetd &>/dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/remount-noatime.patch b/recipes/nslu2-binary-only/unslung-rootfs/remount-noatime.patch deleted file mode 100644 index a39dc678b5..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/remount-noatime.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.1.orig 2006-02-24 20:48:18.000000000 -0600 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.1 2006-02-24 21:13:01.000000000 -0600 -@@ -3,6 +3,24 @@ - #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04 - /bin/echo "Starting Set CGI_ds.conf:"; /etc/rc.d/rc.bootbin; check_status - -+if ( [ -f /.ext3flash ] ) ; then -+ dsk="nodisk" -+ /bin/grep -q "^/dev/sda1 / ext3" /proc/mounts -+ if ( [ $? -eq 0 ] ) ; then -+ dsk="sda" -+ else -+ /bin/grep -q "^/dev/sdb1 / ext3" /proc/mounts -+ if ( [ $? -eq 0 ] ) ; then -+ dsk="sdb" -+ fi -+ fi -+ /bin/echo "Remounting /dev/${dsk}1 as ext3flash:" -+ /bin/mount -o remount,rw,noatime /dev/${dsk}1 -+ /bin/echo "Remounting /dev/${dsk}2 as ext3flash:" -+ /bin/mount -o remount,rw,sync,noatime /dev/${dsk}2 -+ /bin/echo "Removing swap from ext3flash:" -+ /sbin/swapoff /dev/${dsk}3 -+fi - - /bin/echo "Restore time and timezone:"; /etc/rc.d/rc.rstimezone; check_status - /bin/echo "Restore usrgrpshares:"; /etc/rc.d/rc.reset_usrgrpshare; check_status ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.quota.orig 2006-02-24 20:48:31.000000000 -0600 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.quota 2006-02-24 21:12:46.000000000 -0600 -@@ -8,6 +8,21 @@ - echo "Done." - fi - -+if ( [ -f /.ext3flash ] ) ; then -+ dsk="nodisk" -+ /bin/grep -q "^/dev/sda1 / ext3" /proc/mounts -+ if ( [ $? -eq 0 ] ) ; then -+ dsk="sda" -+ else -+ /bin/grep -q "^/dev/sdb1 / ext3" /proc/mounts -+ if ( [ $? -eq 0 ] ) ; then -+ dsk="sdb" -+ fi -+ fi -+ /bin/echo "Remounting /dev/${dsk}1 as ext3flash:" -+ /bin/mount -o remount,rw,noatime /dev/${dsk}1 -+fi -+ - if [ -x "/usr/bin/quotaon" ] - then - echo "Turning on quota." diff --git a/recipes/nslu2-binary-only/unslung-rootfs/resling b/recipes/nslu2-binary-only/unslung-rootfs/resling deleted file mode 100755 index 07dc432ea7..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/resling +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2004 by Oleg I. Vdovikin <oleg@cs.msu.su> -# Modified for Unslung by Rod Whitby -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the 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 -# - -if [ -f /share/flash/data/resling.tar.gz ] ; then - RESLING=/share/flash/data/resling.tar.gz -elif [ -f /share/hdd/data/resling.tar.gz ] ; then - RESLING=/share/hdd/data/resling.tar.gz -elif [ -f /share/flash/conf/resling.tar.gz ] ; then - RESLING=/share/flash/conf/resling.tar.gz -elif [ -f /share/hdd/conf/resling.tar.gz ] ; then - RESLING=/share/hdd/conf/resling.tar.gz -else - RESLING=/share/flash/data/resling.tar.gz -fi - -case "$1" in - start) - if [ -f ${RESLING} ]; then - tar -C / -zxf ${RESLING} - fi - ;; - clear) - rm -f ${RESLING} - ;; - load) - tar -C / -zxvf ${RESLING} - ;; - list) - tar -C / -ztf ${RESLING} - ;; - save) - [ -f /unslung/.files ] && FILES=$(cat /unslung/.files) - rm -f /tmp/resling.tar.gz - tar -C / -zcvf /tmp/resling.tar.gz /unslung $FILES && - rm -f ${RESLING} && - mv /tmp/resling.tar.gz ${RESLING} && - ls -l ${RESLING} && - echo "Saved." - ;; - *) - echo "Usage: $0 start|clear|load|list|save" - ;; -esac diff --git a/recipes/nslu2-binary-only/unslung-rootfs/root-passwd.patch b/recipes/nslu2-binary-only/unslung-rootfs/root-passwd.patch deleted file mode 100644 index 60dae459ba..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/root-passwd.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/passwd.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/passwd 2004-08-30 09:02:51.000000000 -0400 -@@ -1,4 +1,4 @@ --root:WeeOvKUvbQ6nI:0:0:root:/root:/bin/sh -+root:t1PLUeOinN/eI:0:0:root:/root:/bin/sh - bin:x:1:1:bin:/bin: - lp:x:4:7:lp:/share/spool: - mail:x:8:12:mail:/var/spool/mail: ---- nslu2-linksys-ramdisk-2.3r25/usr/local/passwd.orig 2004-07-27 23:37:56.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/usr/local/passwd 2004-08-30 09:02:51.000000000 -0400 -@@ -1,4 +1,4 @@ --root:WeeOvKUvbQ6nI:0:0:root:/root:/bin/sh -+root:t1PLUeOinN/eI:0:0:root:/root:/bin/sh - bin:x:1:1:bin:/bin: - lp:x:4:7:lp:/share/spool: - mail:x:8:12:mail:/var/spool/mail: diff --git a/recipes/nslu2-binary-only/unslung-rootfs/security-fixes.patch b/recipes/nslu2-binary-only/unslung-rootfs/security-fixes.patch deleted file mode 100644 index 8517e7d06b..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/security-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r29/etc/rc.d/rc.1.orig 2005-06-12 21:43:26.940523728 +0930 -+++ nslu2-linksys-ramdisk-2.3r29/etc/rc.d/rc.1 2005-06-12 21:43:36.910008136 +0930 -@@ -19,7 +19,7 @@ - #/bin/echo "Generating telnet password:"; /usr/sbin/TelnetPassword; check_status - /bin/echo "Starting WEB Server:"; . /etc/rc.d/rc.thttpd;check_status - /bin/echo "Starting samba:"; . /etc/rc.d/rc.samba --/bin/echo "Starting download:"; /usr/sbin/download -+#/bin/echo "Starting download:"; /usr/sbin/download - /bin/echo "Starting INET Server:"; . /etc/rc.d/rc.xinetd; check_status - if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then - /bin/echo "Creating ramfs for /tmp:"; mount -t ramfs none /tmp -o maxsize=512 diff --git a/recipes/nslu2-binary-only/unslung-rootfs/slingover b/recipes/nslu2-binary-only/unslung-rootfs/slingover deleted file mode 100755 index 51f03316e5..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/slingover +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -usage="Usage: $0 disk1|disk2" - -if [ $# -gt 1 ] ; then - echo $usage - exit 1 -fi - -if [ $# -lt 1 ] ; then - echo $usage - exit 1 -fi - -if [ "$1" = "disk1" ] ; then - source=/share/hdd/conf - target=/share/hdd/data -elif [ "$1" = "disk2" ] ; then - source=/share/flash/conf - target=/share/flash/data -else - echo $usage - exit 1 -fi - -# Check it's a real mount point - -if grep $source /proc/mounts >/dev/null 2>&1 ; then - echo "Source disk is $source" -else - echo "Error: $source is not a mounted disk" - exit 1 -fi - -if grep $target /proc/mounts >/dev/null 2>&1 ; then - echo "Target disk is $target" -else - echo "Error: $target is not a mounted disk" - exit 1 -fi - -if [ -d $source/opt ] ; then - if [ -d $target/opt.old -a -h $target/opt ] ; then - echo "Reverting old /opt symlink on $target." - rm -f $target/opt - mv $target/opt.old $target/opt - fi - echo "Copying /opt directory from $source to $target." - ( cd $source ; tar cf - opt ) | ( cd $target ; tar xf - ) - rm -rf $source/opt.old - mv $source/opt $source/opt.old -fi - -if [ -d $source/usr ] ; then - if [ -d $target/usr/lib/ipkg.old -a -h $target/usr/lib/ipkg ] ; then - echo "Reverting old /usr/lib/ipkg symlink on $target." - rm -f $target/usr/lib/ipkg - mv $target/usr/lib/ipkg.old $target/usr/lib/ipkg - fi - echo "Copying /usr directory from $source to $target." - ( cd $source ; tar cf - usr ) | ( cd $target ; tar xf - ) - rm -rf $source/usr.old - mv $source/usr $source/usr.old -fi - -if [ -d $source/unslung ] ; then - echo "Copying /unslung directory from $source to $target." - ( cd $source ; tar cf - unslung ) | ( cd $target ; tar xf - ) - rm -rf $source/unslung.old - mv $source/unslung $source/unslung.old -fi - -if [ -f $target/opt/bin/perl ] ; then - echo "Replicating /usr/bin/perl symlink." - ln -s /opt/bin/perl $target/usr/bin/perl -fi - -if [ -f $target/opt/bin/bash ] ; then - echo "Replicating /bin/bash symlink." - ln -s /opt/bin/bash $target/bin/bash -fi - -exit 0 diff --git a/recipes/nslu2-binary-only/unslung-rootfs/telnet-passwd.patch b/recipes/nslu2-binary-only/unslung-rootfs/telnet-passwd.patch deleted file mode 100644 index 9ccfcc12e9..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/telnet-passwd.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/passwd~ 2006-04-18 21:54:47.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/passwd 2006-04-18 21:56:53.000000000 -0500 -@@ -4,7 +4,7 @@ - mail:x:8:12:mail:/var/spool/mail: - ftp:x:14:50:FTP User:/: - nobody:x:99:99:Nobody:/: --ourtelnetrescueuser:sPuRQwXaya5YE:100:100::/home/user:/bin/sh -+ourtelnetrescueuser:x:100:100::/home/user:/dev/null - guest:xqnMpE/plEnFs:501:501::/home/user/guest:/dev/null - admin:cgwvsHpJSf6XU:502:501::/home/user/admin:/dev/null - ---- nslu2-linksys-ramdisk-2.3r63/usr/local/passwd~ 2006-04-18 21:54:47.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/usr/local/passwd 2006-04-18 21:57:48.000000000 -0500 -@@ -4,7 +4,7 @@ - mail:x:8:12:mail:/var/spool/mail: - ftp:x:14:50:FTP User:/: - nobody:x:99:99:Nobody:/: --ourtelnetrescueuser:sPuRQwXaya5YE:100:100::/home/user:/bin/sh -+ourtelnetrescueuser:x:100:100::/home/user:/dev/null - guest:xqnMpE/plEnFs:501:501::/home/user/guest:/dev/null - admin:cgwvsHpJSf6XU:502:501::/home/user/admin:/dev/null - diff --git a/recipes/nslu2-binary-only/unslung-rootfs/telnet.htm b/recipes/nslu2-binary-only/unslung-rootfs/telnet.htm deleted file mode 100644 index c1d339777a..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/telnet.htm +++ /dev/null @@ -1,32 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-
- <HEAD>
- <META HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT">
- <TITLE>Enable/Disable NSLU2 telnet Service</TITLE>
- <LINK REL="stylesheet" TYPE="text/css" HREF="../ig_n.css">
- <SCRIPT language="JavaScript" type="text/javascript" src="../stdlib.js"></SCRIPT>
- </HEAD>
-
- <IMG SRC="../linksys.gif">
- <H2><P ALIGN=CENTER>Enable/Disable NSLU2 telnet Service</P></H2>
-
- <BODY onLoad="showMsg();">
- <CENTER>
- <HR>
- <P>Current telnet service status: <FONT color="ff1111">@status#</FONT></P>
- <FORM ACTION="telnet.cgi" METHOD="post">
- <INPUT type="submit" name="action" value="@action#">
- <INPUT type="Hidden" name="message" value="@message#">
- </FORM>
- </CENTER>
- <HR>
- <P>NOTICE: The telnet service is inherently not secure. Among other security concerns, the login id and passwords you enter will be sent in plaintext across the network. In order to provide a slightly higher degree of security, the service will not be automatically restarted upon reboot. However, if you do not intend to reboot soon, it is recommended that you use this page to disable the service as soon as it is no longer needed.</P>
- <P>A better solution than telnet for network terminal access to the NSLU2 is to use an SSH package, such as "openssh". This package is secure, will remove the need to use a web browser to enable access, and is less prone to inadvertent disabling than telnet. Openssh can be installed using the standard "ipkg" mechanism: "ipkg install openssh". No additional configuration is required; the installer will perform all the necessary configuration to setup openssh as a telnet replacement. <B>You are strongly encouraged to install openssh as soon as possible.</B></P>
- <HR>
- <CENTER>
- <P><A HREF="/index.cgi">Back</A></P>
- </CENTER>
- </BODY>
-
-</HTML>
diff --git a/recipes/nslu2-binary-only/unslung-rootfs/tmp-handling.patch b/recipes/nslu2-binary-only/unslung-rootfs/tmp-handling.patch deleted file mode 100644 index 85e1ecbf80..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/tmp-handling.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1.orig 2005-01-16 09:37:41.000000000 +1030 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1 2005-01-16 09:42:09.000000000 +1030 -@@ -33,6 +33,10 @@ - /bin/echo "Starting download:"; /usr/sbin/download - /bin/echo "Starting INET Server:"; . /etc/rc.d/rc.xinetd; check_status -+if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then - /bin/echo "Creating ramfs for /tmp:"; mount -t ramfs none /tmp -o maxsize=512 -+fi -+/bin/rm -rf /tmp/* /mnt/backup/* -+/bin/chmod 1777 /tmp - /bin/echo "Starting QuickSet Daemon :"; . /etc/rc.d/rc.quickset - /bin/echo "Starting Crond :"; . /etc/rc.d/rc.crond - /bin/echo "Starting Rest Task :"; . /etc/rc.d/rc.local diff --git a/recipes/nslu2-binary-only/unslung-rootfs/unsling b/recipes/nslu2-binary-only/unslung-rootfs/unsling deleted file mode 100755 index 539a1d2b58..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/unsling +++ /dev/null @@ -1,264 +0,0 @@ -#!/bin/sh - -usage="Usage: $0 [-nopw] disk1|disk2" - -nopw=0 -if [ $# -gt 1 ] ; then - if [ "$1" = "-nopw" ] ; then - nopw=1 - shift - fi -fi - -# Set target disk - -if [ $# -eq 1 ] ; then - if [ "$1" = "disk1" ] ; then - mtch="/dev/sdb1 /share/hdd/data ext3 rw 0 0" - targ=/share/hdd/data - targconf=/share/hdd/conf - flag=.sdb1root - htmlinfo="disk1, /dev/sdb1" - fixconf=0 - elif [ "$1" = "disk2" ] ; then - mtch="/dev/sda1 /share/flash/data ext3 rw 0 0" - targ=/share/flash/data - targconf=/share/flash/conf - flag=.sda1root - htmlinfo="disk2, /dev/sda1" - fixconf=1 - else - echo $usage - exit 1 - fi -else - echo $usage - exit 1 -fi - -# MJW - The new "tar" method of unslinging does not care if the device -# has already been unslung. The following test has been removed. -# -# Check that we can unsling at all! An unsling operation creates a new -# rootfs, but it also marks the flash rootfs (with a flag file such as -# ".sda1root") so that subsequent boots do not create the "var.state" -# and "dev.state" mounts. Without those mounts, though, an attempt to -# unsling will write a new rootfs on the target with an empty /dev -# directory, which doesnt' work really well. So this check is all about -# making sure that we are in a state in which we are capable of -# performing the unsling operation. - -#echo "Checking if able to unsling..." -#echo -#m1="/dev/root /dev.state jffs2 rw 0 0" -#m2="/dev/root /var.state jffs2 rw 0 0" -#if ! grep "$m1" /proc/mounts >/dev/null 2>&1 || ! grep "$m2" /proc/mounts >/dev/null 2>&1 ; then -# echo "Error: This system is unable to properly unsling because certain" -# echo "required mounts (dev.state and/or var.state) are not available." -# echo "This is most probably because you have already unslung this system." -# echo -# -# if [ -f /.sda1root ] ; then -# rm -f /.sda1root -# elif [ -f /.sdb1root ] ; then -# rm -f /.sdb1root -# elif [ -f /.sda2root ] ; then -# rm -f /.sda2root -# elif [ -f /.sdb2root ] ; then -# rm -f /.sdb2root -# else -# echo "However, in this case, the flags that indicate an already-unslung" -# echo "system seem to be missing. Try restarting your NSLU2 to correct," -# echo "but if the problem persists, try re-flashing your NSLU2." -# exit 1 -# fi -# echo "The flags that indicate an already-unslung system have now been" -# echo "removed and the required mounts should now become present after" -# echo "reboot of the NSLU2." -# echo -# echo "1) Please unplug all drives from the NSLU2," -# echo "2) reboot," -# echo "3) and retry the unslinging process." -# exit 1 -#fi - -# Check it's a real mount point - -echo "Waiting for $targ ..." -CNT=120 -while [ $CNT -gt 0 ] -do - if grep "$mtch" /proc/mounts >/dev/null 2>&1 ; then - echo - echo "Target disk is $targ" - CNT=-1 - else - echo -ne "\r$CNT " - sleep 1 - CNT=`expr $CNT - 1` - fi -done -if [ $CNT -eq 0 ] ; then - echo - echo "Error: $targ ($htmlinfo) is not a mounted disk" - exit 1 -fi - -# Do a quick sanity check to make sure we're unslinging to a disk that's been -# formatted by the Linksys code. - -echo "Checking that $targ has been properly formatted..." -if ! [ -d $targ/public ] || ! [ -f $targconf/.dongle ] || ! [ -f $targconf/passwd ] ; then - echo - echo "Error: $targ does not appear to have been formatted by the" - echo "Linksys formatting utility. Please go to the web interface," - echo "and format the drive before unslinging." - exit 1 -fi - -echo "Checking that $targ is clean..." -if [ -f $targ/.unslung ] ; then - echo - echo "Error: $targ appears to have already been unslung to:" - cat $targ/.unslung - echo "Please go to the web interface, and format the drive before" - echo "unslinging." - echo - echo "(Or, if you wish to unsling without removing the current root" - echo "filesystem, simply remove the file $targ/.unslung and retry" - echo "the unsling -- but beware, you enter uncharted territory!)" - exit 1 -fi - -# Change the root password -if [ "$nopw" -eq 0 ] ; then - echo - echo "Please enter the new root password. This will be the new root" - echo "password used when the NSLU2 boots up with or without disks" - echo - passwd - if [ $? -ne 0 ] ; then - echo "Error setting password." - exit 1 - fi -# Quick sanity check, something may have gone wrong while we were -# waiting at the passwd prompt... - if ! [ -d $targ/public ] || ! [ -f $targconf/.dongle ] || ! [ -f $targconf/passwd ] ; then - echo - echo "Error: $targ appears to have vanished into thin air." - echo "This would indicate some type of problem with the USB cable," - echo "the device, or the formatting of the device." - exit 1 - fi - cp /etc/passwd /usr/local/passwd - grep "^root:" /etc/passwd >$targconf/passwd.new - grep -v "^root:" $targconf/passwd >>$targconf/passwd.new - mv $targconf/passwd $targconf/passwd.save - mv $targconf/passwd.new $targconf/passwd - chmod 644 $targconf/passwd -fi - -# Start at the root directory - -cd / - -# Save the existing ipkg database. - -rm -rf $targ/usr/lib/ipkg.old -if [ -f $targ/usr/lib/ipkg/status ] ; then - mv $targ/usr/lib/ipkg $targ/usr/lib/ipkg.old -fi - -# Copy the complete rootfs to the target. - -echo -echo "Copying the complete rootfs from / to $targ ... " -echo " (this will take just a couple of minutes)" -# Quick sanity check to avoid filling the flash... -if ! [ -d $targ/public ] || ! [ -f $targconf/.dongle ] || ! [ -f $targconf/passwd ] ; then - echo - echo "Error: $targ appears to have vanished into thin air." - echo "This would indicate some type of problem with the USB cable," - echo "the device, or the formatting of the device." - exit 1 -fi - -echo "./var/tmp" > /tmp/xfile -echo "./dev.state" >> /tmp/xfile -echo "./var.state" >> /tmp/xfile -echo "./lost+found" >>/tmp/xfile -mkdir -p /tmp/tmprootfs -/bin/mount /dev/mtdblock4 /tmp/tmprootfs -/bin/tar -c -C /tmp/tmprootfs -X /tmp/xfile -f - . | (cd $targ; /bin/tar -x -f -) -/bin/umount /tmp/tmprootfs -echo "Copy complete ..." -echo - -# Copy over the existing ipkg database. - -if [ -f $targ/usr/lib/ipkg.old/status ] ; then - echo "Preserving existing ipkg database on target disk." - ( cd $targ/usr/lib/ipkg.old ; tar cf - . ) | ( cd $targ/usr/lib/ipkg ; tar xf - ) -fi - -echo "Linking /usr/bin/ipkg executable on target disk." -rm -f $targ/usr/bin/ipkg ; ln -s /usr/bin/ipkg-cl $targ/usr/bin/ipkg - -echo "Linking /etc/motd to the unslung motd on target disk." -rm -f $targ/etc/motd ; ln -s /etc/motd-un $targ/etc/motd - -echo "Updating /home/httpd/html/home.htm with target disk info." -sedcommand="s#Running.from.Internal.Flash#Unslung to $htmlinfo#" -rm -f $targ/home/httpd/html/home.htm_bak -cp $targ/home/httpd/html/home.htm $targ/home/httpd/html/home.htm_bak -sed "$sedcommand" $targ/home/httpd/html/home.htm_bak > $targ/home/httpd/html/home.htm -chmod 644 $targ/home/httpd/html/home.htm - -# Create a few empty files that are expected to be present -touch $targ/var/log/wtmp -chmod 644 $targ/var/log/wtmp -touch $targ/var/run/utmp -chmod 644 $targ/var/run/utmp -mkdir -p $targ/var/tmp -chmod 777 $targ/var/tmp - -# The "user password" Linksys utility is hard-coded to /share/hdd; also the -# QuickSet utility seems to have some difficulty as well. Ugly fix is to -# add symlinks if we are unslinging to /share/flash. It might seem more -# reasonable to point to /etc/passwd, for example, but this approach seems to -# be more likely to avoid looping symlinks. - -if [ "$fixconf" -eq 1 ] ; then - ln -s ../../flash/conf/.htpasswd $targ/share/hdd/conf/.htpasswd - ln -s ../../flash/conf/backup_sh.conf $targ/share/hdd/conf/backup_sh.conf - ln -s ../../flash/conf/config $targ/share/hdd/conf/config - ln -s ../../flash/conf/group $targ/share/hdd/conf/group - ln -s ../../flash/conf/passwd $targ/share/hdd/conf/passwd - ln -s ../../flash/conf/server.log $targ/share/hdd/conf/server.log - ln -s ../../flash/conf/share $targ/share/hdd/conf/share - ln -s ../../flash/conf/share.info $targ/share/hdd/conf/share.info - ln -s ../../flash/conf/smb.conf $targ/share/hdd/conf/smb.conf - ln -s ../../flash/conf/smbpasswd $targ/share/hdd/conf/smbpasswd - ln -s ../../flash/conf/tmp $targ/share/hdd/conf/tmp - ln -s ../../flash/conf/upgrade $targ/share/hdd/conf/upgrade - ln -s ../../flash/conf/usrgrp.info $targ/share/hdd/conf/usrgrp.info -fi - -# Create the boot flag file. - -rm -f /.sd??root $targ/.sd??root - -echo "Creating /$flag to direct switchbox to boot from $targ." -echo > /$flag -echo > $targ/$flag - -# Done - -echo -echo "Unsling complete." -echo -echo "Leave the device $htmlinfo, plugged in and reboot (using" -echo "either the Web GUI, or the command \"DO_Reboot\") in order to boot" -echo "this system up into unslung mode." - -exit 0 diff --git a/recipes/nslu2-binary-only/unslung-rootfs/unslung.gif b/recipes/nslu2-binary-only/unslung-rootfs/unslung.gif Binary files differdeleted file mode 100644 index 998beeda50..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/unslung.gif +++ /dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/upgrade.htm b/recipes/nslu2-binary-only/unslung-rootfs/upgrade.htm deleted file mode 100644 index 39c65b2e7c..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/upgrade.htm +++ /dev/null @@ -1,130 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html><head><title>Upgrade Firmware</title> -<LINK REL="stylesheet" TYPE="text/css" HREF="../ig_n.css"> -<meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> -<script language="JavaScript" type="text/javascript" src="../stdlib.js"></script> -<script language="JavaScript" type="text/javascript" src="../message.js"></script> -</head> - -<body bgcolor="white" onLoad="showMsg()" marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> -<FORM name="upgrade" method="post" action="upgrade.cgi" ENCTYPE="multipart/form-data"> -<DIV align="center"> -<table border="0" cellpadding="0" cellspacing="0" width="750" align="center"> -<tr> - <td width="165"><img border="0" src="../linksys.gif" width="165" height="57"></td> - <td width="585" colspan="2" bgcolor="#6666CC" valign="bottom" align="right"><span class="fwversion">Firmware - Version: @ds_sw_version#</span> </td> -</tr> - -<tr> - <td colspan="3" height="11" bgcolor="black"><img src="../tborder.gif" width="750" height="11" alt="" border="0"></td> -</tr> - -<TR> - <TD width="165" bgcolor="black" align="center"><h3>Upgrade</h3></td> - <td width="585" colspan="2" bgcolor="#6666cc" valign="top"> - <table border="0" cellspacing="0" cellpadding="0" width="100%"> - <tr> - <td align="right" class="pname" height="25" colspan="5">Network Storage Link for USB 2.0 Disks </td> - <td align="center" width="100" class="mname">NSLU2</td> - </tr> - <tr bgcolor="black"> - <td colspan="6" height="3"><img src="TRANSPAR.GIF" width="1" height="3" alt="" border="0"></td> - </tr> - <tr> - <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="8" alt="" border="0"></td> - <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> - <td align="center" height="1"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> - <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> - <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> - <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> - </tr> - - <tr> - <td align="center" height="25" bgcolor="black" width="100"><a href="/index.cgi" class="mainmenu">Home</a></td> - <td align="center" height="25" bgcolor="black" width="100"><a href="/user_pass.cgi" class="mainmenu">User<br> password</a></td> - <td align="center" height="25" width="100"><span class="mainmenu">Administration</span></td> - <td align="center" height="25" bgcolor="black" width="100"><a href="/userman_fs.htm" class="mainmenu">User Guide</a></td> - <td align="center" height="25" bgcolor="black" width="120"><a href="http://www.linksys.com" class="mainmenu" target="new_win">Linksys Web</a></td> - <td align="center" height="25" bgcolor="black"> </td> - </tr> - <tr> - <td height="25" width="130"> </td> - <td height="25" colspan="5"> - <a href="/Management/file_sharing.cgi?next_file=groups.htm" class="submenu">Groups</a> <span class="divider"> | </span> - <a href="/Management/file_sharing.cgi?next_file=shares.htm" class="submenu">Shares</a> <span class="divider"> | </span> - <a href="/Management/sh_backup.cgi?next_file=backup.htm" class="submenu">Backup</a> <span class="divider"> | </span> - <a href="/Management/disk_fs.htm" class="submenu">Disk</a> <span class="divider"> | </span> - <span class="tabtitle">Upgrade</span> <span class="divider"> | </span> - <a href="/Management/setup.cgi?next_file=lan.htm" class="submenu">Setup</a></td> - </tr> - </table> - - </td> -</tr> - -<tr> - <td colspan="3" bgcolor="#e7e7e7" height="6"><img src="TRANSPAR.GIF" width="1" height="6" alt="" border="0"></td> -</tr> -<tr> - <th width="165" height="24">Current Firmware </th> - <td width="409"><img src="TRANSPAR.GIF" width="409" height="6" alt="" border="0"></td> - <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="24" width="15"></td> -</tr> -<tr> - <td bgcolor="#e7e7e7" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="80"></td> - <td width="409"><div class="std"><table border=0 cellspacing=0 cellpadding=4> - <tr> - <td nowrap>Current Firmware Version:</td> - <td nowrap>@ds_sw_version# </td> - </tr> - </table></div> </td> - <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="80" width="15"></td> -</tr> - -<tr> - <th width="165" height="24">Upgrade </th> - <td width="409"><img src="TRANSPAR.GIF" width="409" height="6" alt="" border="0"></td> - <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="24" width="15"></td> -</tr> -<tr> - <td bgcolor="#e7e7e7" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="120"></td> - <td width="409"><div class="std"><table border=0 cellspacing=0 cellpadding=4> - <tr> - </tr> - <tr> -<td colspan="2" align="left" class="smsg"> -NOTE: You cannot use this upgrade page to install new firmware on Unslung. -Instead, use the "reset button" method to enter upgrade mode, and use either -the "sercomm" or the "upslug2" utility to perform the reflash operation. See -<a href="http://www.nslu2-linux.org/wiki/HowTo/UseTheResetButtonToEnterUpgradeMode"> -"How To Use The Reset Button To Enter Upgrade Mode"</a>, and -<a href="http://www.nslu2-linux.org/wiki/HowTo/RecoverFromABadFlash"> -"How To Recover From A Bad Flash"</a> if you need more information. -</td> - </tr> - </table></div> </td> - <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="120" width="15"></td> -</tr> - -<tr> - <td bgcolor="#e7e7e7" height="30" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="30"></td> - <td height="30"> </td> - <td rowspan="2" valign="bottom" bgcolor="#6666cc" height="64"><img src="../cisco.gif" hspace="0" vspace="0"></td> -</tr> - -<tr> - <td bgcolor="black" height="34"> </td> - <td bgcolor="#6666cc" align="right" height="33" valign="middle"> - </td> -</tr> - -</table> -</div> -<input type="Hidden" name="message" value="@message#"> -<input type="Hidden" name="this_file" value="upgrade.htm"> -<input type="Hidden" name="todo" value="@todo#"> -<input type="Hidden" name="finish" value="@finish#"> -</form> -</body> -</html> diff --git a/recipes/nslu2-binary-only/unslung-rootfs/wait-for-quotacheck.patch b/recipes/nslu2-binary-only/unslung-rootfs/wait-for-quotacheck.patch deleted file mode 100644 index 71c8e9caec..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/wait-for-quotacheck.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local~ 2005-04-03 10:14:51.000000000 +0930 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local 2005-04-03 10:14:59.000000000 +0930 -@@ -14,6 +14,6 @@ - /bin/chmod 775 /share 2>/dev/null - /bin/chown admin.everyone /share/hdd/ 2>/dev/null - /bin/chown admin.everyone /share 2>/dev/null --/etc/rc.d/rc.quota &>/dev/null -+/etc/rc.d/rc.quota 2>/dev/null - /usr/sbin/init_media 2>/dev/null - /bin/echo "$HOSTNAME: boot complete!"; check_status diff --git a/recipes/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/recipes/nslu2-binary-only/unslung-rootfs_2.3r63.bb deleted file mode 100644 index 0eebf7d04f..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs_2.3r63.bb +++ /dev/null @@ -1,181 +0,0 @@ -SECTION = "base" -COMPATIBLE_MACHINE = "nslu2" - -PR = "r22" - -DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages" - -SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \ - file://README \ - file://NOTES \ - file://ipkg-fl \ - file://motd-fl \ - file://motd-un \ - file://unsling \ -# file://resling \ -# file://slingover \ - file://linuxrc \ - file://unslung.gif \ - file://nsswitch.conf \ - file://rc.bootdisk \ - file://rc.optware-start \ - file://rc.optware-stop \ - file://rc-diversion.patch;patch=1 \ - file://rc.1-diversion.patch;patch=1 \ - file://rc.1-timestamp.patch;patch=1 \ - file://rc.crond-diversion.patch;patch=1 \ - file://rc.halt-diversion.patch;patch=1 \ - file://rc.lan-shell.patch;patch=1 \ - file://rc.local-diversion.patch;patch=1 \ - file://rc.modules-diversion.patch;patch=1 \ - file://rc.network-diversion.patch;patch=1 \ - file://rc.quickset-diversion.patch;patch=1 \ - file://rc.quota-diversion.patch;patch=1 \ - file://rc.reboot-diversion.patch;patch=1 \ - file://rc.reset_usrgrpshare-diversion.patch;patch=1 \ - file://rc.rstimezone-diversion.patch;patch=1 \ - file://rc.samba-diversion.patch;patch=1 \ - file://rc.samba-syntaxfix.patch;patch=1 \ - file://rc.sysinit-diversion.patch;patch=1 \ - file://rc.thttpd-diversion.patch;patch=1 \ - file://rc.xinetd-diversion.patch;patch=1 \ - file://root-passwd.patch;patch=1 \ - file://tmp-handling.patch;patch=1 \ - file://create-ramdisks.patch;patch=1 \ - file://remount-noatime.patch;patch=1 \ - file://initialise-mtab.patch;patch=1 \ - file://wait-for-quotacheck.patch;patch=1 \ - file://mount_usbdevfs.patch;patch=1 \ - file://security-fixes.patch;patch=1 \ - file://rc.sysinit-clean_var.patch;patch=1 \ - file://rc.sysinit-cpbug.patch;patch=1 \ - file://rc.sysinit-win_share.patch;patch=1 \ - file://rc.modules-nls.patch;patch=1 \ - file://telnet-passwd.patch;patch=1 \ - file://upgrade.htm \ - file://telnet.htm \ - file://rc.bootbin \ - file://mkfs.ext3 \ - " - -S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63" - -do_compile () { - echo "V2.3R63-uNSLUng-${DISTRO_VERSION}" > ${S}/.unslung - - install -m 644 ${WORKDIR}/unslung.gif ${S}/home/httpd/html/linksys.gif - - install -m 644 ${WORKDIR}/telnet.htm ${S}/home/httpd/html/Management/telnet.htm - - sed -i -e 's/@version#</@version#-uNSLUng-'${DISTRO_VERSION}'</' ${S}/home/httpd/html/home.htm - install -m 644 ${WORKDIR}/upgrade.htm ${S}/home/httpd/html/Management/upgrade.htm - sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${DISTRO_VERSION}/ \ - ${S}/home/httpd/html/Management/upgrade.htm - - install -m 755 ${WORKDIR}/ipkg-fl ${S}/usr/bin/ipkg-fl - install -m 644 ${WORKDIR}/motd-fl ${S}/etc/motd-fl - sed -i -e s/@v@/V2.3R63-uNSLUng-${DISTRO_VERSION}/ ${S}/etc/motd-fl - install -m 644 ${WORKDIR}/motd-un ${S}/etc/motd-un - sed -i -e s/@v@/V2.3R63-uNSLUng-${DISTRO_VERSION}/ ${S}/etc/motd-un - rm -f ${S}/etc/motd - ln -s motd-fl ${S}/etc/motd - sed -i -e 's+@public_2#</td>+@public_2# <span class="divider"> | </span><a href="Management/telnet.cgi" class="submenu">\ Manage Telnet</a></td>+' \ - ${S}/home/httpd/html/home.htm - sed -i -e 's+<td bgcolor="#6666cc" align="right" height="33" valign="middle"> </td>+<td bgcolor="#6666cc" fgcolor="#ffffff" align="right" height="33" valign="middle"><center><span class=mainmenu>uNSLUng status: \ Running from Internal Flash</span></center></td>+' \ - ${S}/home/httpd/html/home.htm - - sed -i -e 's|> <|><a href="Unslung" class="mainmenu" target="_top">Unslung Doco</a><|' \ - ${S}/home/httpd/html/manhead.htm - install -d ${S}/opt/doc - install -m 755 ${WORKDIR}/README ${S}/opt/doc/README - install -m 755 ${WORKDIR}/NOTES ${S}/opt/doc/NOTES - rm -f ${S}/home/httpd/html/Unslung - ln -s /opt/doc ${S}/home/httpd/html/Unslung - - install -m 755 ${WORKDIR}/linuxrc ${S}/linuxrc - - # Allow rc.bootbin to be diverted. - mv ${S}/etc/rc.d/rc.bootbin ${S}/sbin/rc.bootbin - install -m 755 ${WORKDIR}/rc.bootbin ${S}/etc/rc.d/rc.bootbin - - install -d ${S}/initrd - - install -m 755 ${WORKDIR}/unsling ${S}/sbin/unsling -# install -m 755 ${WORKDIR}/resling ${S}/sbin/resling -# install -m 755 ${WORKDIR}/slingover ${S}/sbin/slingover - install -m 755 ${WORKDIR}/rc.optware-start ${S}/etc/rc.d/rc.optware-start - install -m 755 ${WORKDIR}/rc.optware-stop ${S}/etc/rc.d/rc.optware-stop - install -m 755 ${WORKDIR}/rc.bootdisk ${S}/etc/rc.d/rc.bootdisk - - install -m 644 ${WORKDIR}/nsswitch.conf ${S}/etc/nsswitch.conf - - # Add the diversion script directory - install -d ${S}/unslung - - # Remove the libraries, because they are in nslu2-linksys-libs now - rm -rf ${S}/lib - - # Remove some unnecessary web stuff to free space - rm -f ${S}/home/httpd/html/Management/upgrade.cgi - rm -f ${S}/home/httpd/html/Management/upgrade_ui.htm - rm -f ${S}/home/httpd/html/Management/upgrade_ui.cgi - - # Remove some of the Samba codepages to make space - # These will have to be separately packaged, like the libraries... - # 437 (USA) - keep - # 737 (Greek) - rm -f ${S}/etc/samba/codepages/codepage.737 - rm -f ${S}/etc/samba/codepages/unicode_map.737 - # 850 (Latin1) - keep - # 852 (Latin2) - rm -f ${S}/etc/samba/codepages/codepage.852 - rm -f ${S}/etc/samba/codepages/unicode_map.852 - # 861 (Iceland) - rm -f ${S}/etc/samba/codepages/codepage.861 - rm -f ${S}/etc/samba/codepages/unicode_map.861 - # 866 (Russian) - rm -f ${S}/etc/samba/codepages/codepage.866 - rm -f ${S}/etc/samba/codepages/unicode_map.866 - # 932 (Japanese Shift-JIS) - rm -f ${S}/etc/samba/codepages/codepage.932 - rm -f ${S}/etc/samba/codepages/unicode_map.932 - # 936 (Simplified Chinese) - rm -f ${S}/etc/samba/codepages/codepage.936 - # 949 (Korean) - rm -f ${S}/etc/samba/codepages/codepage.949 - # 950 (Chinese BIG-5) - rm -f ${S}/etc/samba/codepages/codepage.950 - # ISO8859-1 (Latin 1) - keep - - # /bin/killall and /usr/bin/killall are both symlinks to busybox. This - # is a problem if killall is ever replaced by slingbox or a native utility. - # Fix by making /bin/killall (the wrong place) a symlink to /usr/bin/killall. - rm -f ${S}/bin/killall - ln -s ../usr/bin/killall ${S}/bin/killall - - # There are two identical binary copies of "date" on the image. Replace - # the one in /usr/sbin with a symlink to the one in /bin. This saves a - # bit of flash space, and makes it possible to replace the date binary with - # a link to busybox or slingbox at some point. - rm -r ${S}/usr/sbin/date - ln -s ../../bin/date ${S}/usr/sbin/date - - # Replace the Linksys-provided /bin/busybox with a link to slingbox. - rm -f ${S}/bin/busybox - ln -s slingbox ${S}/bin/busybox - - # Add in the kludge to fix the strange Linksys GUI format problem. - rm -f ${S}/usr/bin/mkfs.ext3 - install -m 755 ${WORKDIR}/mkfs.ext3 ${S}/usr/bin/mkfs.ext3 - - # No reason not to have a home directory for root... - mkdir -p ${S}/root - chmod 755 ${S}/root -} - -do_install () { - ( cd ${S} ; tar -c -v -f - --exclude '.pc' . ) | ( cd ${D} ; tar xvf - ) -} - -FILES_${PN} = "/" -RDEPENDS_${PN} = "nslu2-linksys-libs" diff --git a/recipes/subversion/files/libtool.patch b/recipes/subversion/files/libtool.patch new file mode 100644 index 0000000000..d296806b12 --- /dev/null +++ b/recipes/subversion/files/libtool.patch @@ -0,0 +1,12 @@ +Index: subversion-1.4.5/configure.in +=================================================================== +--- subversion-1.4.5.orig/configure.in 2007-01-01 14:41:51.000000000 +0000 ++++ subversion-1.4.5/configure.in 2009-04-30 21:19:12.000000000 +0000 +@@ -11,6 +11,7 @@ + + AC_CONFIG_SRCDIR(subversion/include/svn_types.h) + AC_CONFIG_AUX_DIR([build]) ++AC_CONFIG_MACRO_DIR([build/ac-macros]) + + AC_MSG_NOTICE([Configuring Subversion ]AC_PACKAGE_VERSION) + diff --git a/recipes/subversion/subversion_1.4.5.bb b/recipes/subversion/subversion_1.4.5.bb index d4f290590f..1029e70c5c 100644 --- a/recipes/subversion/subversion_1.4.5.bb +++ b/recipes/subversion/subversion_1.4.5.bb @@ -9,7 +9,8 @@ PR = "r0" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ - file://neon-detection.patch;patch=1" + file://neon-detection.patch;patch=1 \ + file://libtool.patch;patch=1" EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ --without-berkeley-db --without-apxs --without-apache \ @@ -23,6 +24,14 @@ export LDFLAGS += " -L${STAGING_LIBDIR} " acpaths = "-I build/ -I build/ac-macros/" +# FIXME: Ugly hack! Instead of fully porting to the new libtool, apply libtool.patch and do the rest here. +do_configure_prepend() { + rm -f build/libtool.m4 +} +do_configure_append() { + if ! test -f libtool ; then cp -a *-libtool libtool ; fi +} + do_stage() { autotools_stage_all } diff --git a/recipes/tasks/task-slugos-extd.bb b/recipes/tasks/task-slugos-extd.bb new file mode 100644 index 0000000000..ab82407d97 --- /dev/null +++ b/recipes/tasks/task-slugos-extd.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Task packages for the SlugOS Extended image" +PR = "r0" +LICENSE = "MIT" + +inherit task + +RNG_TOOLS_PACKAGE = "rng-tools" +RNG_TOOLS_PACKAGE_linux-uclibc = "" + +RDEPENDS_${PN} = "\ + ${RNG_TOOLS_PACKAGE} \ + kexec-tools \ +" + +RRECOMMENDS_${PN} = "\ + kernel-module-libata \ + kernel-module-pata-artop \ + kernel-module-via-velocity \ + kernel-module-netconsole \ +" + +# Other candidate packages that have been considered and +# may be included in the future: +# +# portmap \ +# kernel-module-isofs \ +# kernel-module-udf \ +# kernel-module-loop \ +# wireless-tools \ +# wpa-supplicant \ +# zd1211-firmware kernel-module-zd1211rw \ +# madwifi-ng-modules madwifi-ng-tools \ diff --git a/recipes/tasks/task-slugos.bb b/recipes/tasks/task-slugos.bb index f622aebfe5..0a170d1820 100644 --- a/recipes/tasks/task-slugos.bb +++ b/recipes/tasks/task-slugos.bb @@ -6,9 +6,9 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r22" +PR = "r22.3" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" +COMPATIBLE_MACHINE = "(nslu2|ixp4xx|sheevaplug)" ALLOW_EMPTY = "1" #---------------------------------------------------------------------------------- @@ -17,7 +17,8 @@ ALLOW_EMPTY = "1" # EXTRA PACKAGES # -------------- # The standard firmware contents and additional packages built as requirements -# of the firmware are defined here in SLUGOS_STANDARD_RDEPENDS. +# of the firmware are defined here in SLUGOS_STANDARD_RDEPENDS. This represents +# the standard set of software for the 8-MByte NSLU2 device. SLUGOS_STANDARD_RDEPENDS = "" SLUGOS_STANDARD_RRECOMMENDS = "" @@ -64,13 +65,6 @@ kernel-module-nls-utf8 \ kernel-module-nfs \ " -# Add daemon required for HW RNG support -SLUGOS_RNG_TOOLS_PACKAGE = "rng-tools" -SLUGOS_RNG_TOOLS_PACKAGE_linux-uclibc = "" -SLUGOS_STANDARD_RRECOMMENDS += "\ -${SLUGOS_RNG_TOOLS_PACKAGE} \ -" - # Add modules required for usb support SLUGOS_STANDARD_RRECOMMENDS += "\ kernel-module-ehci-hcd \ @@ -78,42 +72,21 @@ kernel-module-ohci-hcd \ kernel-module-uhci-hcd \ " -# Add modules required for IDE support -SLUGOS_STANDARD_RRECOMMENDS += "\ -kernel-module-libata \ -kernel-module-pata-artop \ -" - # Add modules required for Network support +# Note - this needs to be made machine-specific. SLUGOS_STANDARD_RRECOMMENDS += "\ kernel-module-mii \ kernel-module-ixp4xx-mac \ kernel-module-ixp4xx-qmgr \ -kernel-module-via-velocity \ -kernel-module-netconsole \ " # Add packages and modules required for RAID-1 support -# (temporary, intended only to facilitate testing - MJW) SLUGOS_STANDARD_RRECOMMENDS += "\ mdadm \ kernel-module-md-mod \ kernel-module-raid1 \ " -# Other candidate packages that have been considered and -# are intentionally excluded from the base flash image. -# -# portmap \ -# kexec-tools \ -# kernel-module-isofs \ -# kernel-module-udf \ -# kernel-module-loop \ -# wireless-tools \ -# wpa-supplicant \ -# zd1211-firmware kernel-module-zd1211rw \ -# madwifi-ng-modules madwifi-ng-tools \ - DISTRO_EXTRA_DEPENDS ?= "" DEPENDS += "${DISTRO_EXTRA_DEPENDS}" @@ -141,6 +114,7 @@ DISTRO_EXTRA_RDEPENDS ?= "" ## and it uses the busybox wget command instead of libcurl - MJW ## SlugOS 5.0 - module-init-tools replaced by busybox as well - MJW ## SlugOS 5.2 - module-init-tools reinstated due to busybox bugs - MJW +## SlugOS 5.4 - util-linux-mount reinstated due to busybox bugs - MJW RDEPENDS += "\ kernel ixp4xx-npe \ @@ -151,6 +125,7 @@ RDEPENDS += "\ opkg-collateral opkg-nogpg-nocurl \ libgcc \ beep \ + util-linux-mount \ ${SLUGOS_STANDARD_RDEPENDS} \ ${DISTRO_EXTRA_RDEPENDS}" diff --git a/recipes/update-modules/update-modules_1.0.bb b/recipes/update-modules/update-modules_1.0.bb index 0c2d1894ac..9ec2ff04a6 100644 --- a/recipes/update-modules/update-modules_1.0.bb +++ b/recipes/update-modules/update-modules_1.0.bb @@ -19,19 +19,9 @@ do_install() { install ${WORKDIR}/update-modules ${D}${sbindir} } -# The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which -# supports both 2.4 and 2.6 kernels. Rather than forcing OE to have -# to deal with that unique legacy corner case, we just nullify the -# RDEPENDS here and handle it in the Unslung image recipe. I know this -# is ugly. Please don't remove it unless you first make the RDEPENDS -# line at the top of this file understand that a machine can be used -# in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's -# not worth the effort to do that, so just overlook the next line. -RDEPENDS_unslung = "" - # The SlugOS distro is testing the use of the busybox mod* utilities. # If that works out, we should create a virtual/update-modules, and # let the distros select if they want busybox, or some other package # to provide it. Until then, the following line just removes the # unwanted dependencies for SlugOS. -RDEPENDS_slugos = ""
\ No newline at end of file +RDEPENDS_slugos = "" diff --git a/recipes/wget/wget_1.9.1.bb b/recipes/wget/wget_1.9.1.bb index d3858e4e47..b1e9404c01 100644 --- a/recipes/wget/wget_1.9.1.bb +++ b/recipes/wget/wget_1.9.1.bb @@ -15,8 +15,6 @@ inherit autotools gettext # Disable checking for SSL since that searches the system paths EXTRA_OECONF = "--enable-ipv6 --without-ssl" -# The unslung kernel does not support ipv6 -EXTRA_OECONF_unslung = "--without-ssl" # SlugOS kernels do not support ipv6. Can be loaded as a module. EXTRA_OECONF_slugos = "--without-ssl" diff --git a/recipes/xst/files/makefile-fix.patch b/recipes/xst/files/makefile-fix.patch new file mode 100644 index 0000000000..3af2d57d70 --- /dev/null +++ b/recipes/xst/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2005-08-27 01:13:47.000000000 +0200 ++++ xst-0.15/Makefile 2009-05-01 15:48:15.000000000 +0200 +@@ -32,7 +32,7 @@ + + install-program: $(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + + clean: + rm -f $(PACKAGE) $(OBJS) $(DEPS) diff --git a/recipes/xst/xst_0.15.bb b/recipes/xst/xst_0.15.bb index 76ab7af26f..6d6156e778 100644 --- a/recipes/xst/xst_0.15.bb +++ b/recipes/xst/xst_0.15.bb @@ -5,3 +5,5 @@ SECTION = "gpe" DESCRIPTION = "GPE configuration utility" LICENSE = "GPL" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" + +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/zd1211/files/unslung-iwpriv-hack.patch b/recipes/zd1211/files/unslung-iwpriv-hack.patch deleted file mode 100644 index 64f3806140..0000000000 --- a/recipes/zd1211/files/unslung-iwpriv-hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 -+++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 -@@ -349,8 +349,14 @@ - { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, - { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, - { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, -- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// HACK HACK HACK - The following two lines are commented out in order to make -+// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions -+// can only handle up to 16 iwpriv entries in this structure. Yes, the correct -+// fix is to patch the Wireless Extensions in the Unslung kernel. This hack -+// should be removed when that's actually done. ~mwester 27APR2006 -+// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -+// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// End of HACK - { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, - { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, - }; diff --git a/recipes/zd1211/files/unslung-writel-logging.patch b/recipes/zd1211/files/unslung-writel-logging.patch deleted file mode 100644 index 00d54d7d68..0000000000 --- a/recipes/zd1211/files/unslung-writel-logging.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 -+++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 -@@ -652,7 +652,10 @@ - count++; - - if (count > 5) { -- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); -+// You are going to see this often enough on Unslung that we might as well put it in -+// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 -+// -+ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); - break; - } - } diff --git a/recipes/zd1211/zd1211-r77/unslung-iwpriv-hack.patch b/recipes/zd1211/zd1211-r77/unslung-iwpriv-hack.patch deleted file mode 100644 index 64f3806140..0000000000 --- a/recipes/zd1211/zd1211-r77/unslung-iwpriv-hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 -+++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 -@@ -349,8 +349,14 @@ - { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, - { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, - { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, -- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// HACK HACK HACK - The following two lines are commented out in order to make -+// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions -+// can only handle up to 16 iwpriv entries in this structure. Yes, the correct -+// fix is to patch the Wireless Extensions in the Unslung kernel. This hack -+// should be removed when that's actually done. ~mwester 27APR2006 -+// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -+// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// End of HACK - { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, - { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, - }; diff --git a/recipes/zd1211/zd1211-r77/unslung-writel-logging.patch b/recipes/zd1211/zd1211-r77/unslung-writel-logging.patch deleted file mode 100644 index 00d54d7d68..0000000000 --- a/recipes/zd1211/zd1211-r77/unslung-writel-logging.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 -+++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 -@@ -652,7 +652,10 @@ - count++; - - if (count > 5) { -- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); -+// You are going to see this often enough on Unslung that we might as well put it in -+// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 -+// -+ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); - break; - } - } diff --git a/recipes/zd1211/zd1211-r83/unslung-iwpriv-hack.patch b/recipes/zd1211/zd1211-r83/unslung-iwpriv-hack.patch deleted file mode 100644 index 64f3806140..0000000000 --- a/recipes/zd1211/zd1211-r83/unslung-iwpriv-hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 -+++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 -@@ -349,8 +349,14 @@ - { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, - { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, - { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, -- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// HACK HACK HACK - The following two lines are commented out in order to make -+// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions -+// can only handle up to 16 iwpriv entries in this structure. Yes, the correct -+// fix is to patch the Wireless Extensions in the Unslung kernel. This hack -+// should be removed when that's actually done. ~mwester 27APR2006 -+// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -+// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// End of HACK - { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, - { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, - }; diff --git a/recipes/zd1211/zd1211-r83/unslung-writel-logging.patch b/recipes/zd1211/zd1211-r83/unslung-writel-logging.patch deleted file mode 100644 index 00d54d7d68..0000000000 --- a/recipes/zd1211/zd1211-r83/unslung-writel-logging.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 -+++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 -@@ -652,7 +652,10 @@ - count++; - - if (count > 5) { -- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); -+// You are going to see this often enough on Unslung that we might as well put it in -+// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 -+// -+ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); - break; - } - } diff --git a/recipes/zd1211/zd1211-r85/unslung-iwpriv-hack.patch b/recipes/zd1211/zd1211-r85/unslung-iwpriv-hack.patch deleted file mode 100644 index 64f3806140..0000000000 --- a/recipes/zd1211/zd1211-r85/unslung-iwpriv-hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 -+++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 -@@ -349,8 +349,14 @@ - { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, - { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, - { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, -- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// HACK HACK HACK - The following two lines are commented out in order to make -+// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions -+// can only handle up to 16 iwpriv entries in this structure. Yes, the correct -+// fix is to patch the Wireless Extensions in the Unslung kernel. This hack -+// should be removed when that's actually done. ~mwester 27APR2006 -+// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -+// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// End of HACK - { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, - { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, - }; diff --git a/recipes/zd1211/zd1211-r85/unslung-writel-logging.patch b/recipes/zd1211/zd1211-r85/unslung-writel-logging.patch deleted file mode 100644 index 00d54d7d68..0000000000 --- a/recipes/zd1211/zd1211-r85/unslung-writel-logging.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 -+++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 -@@ -652,7 +652,10 @@ - count++; - - if (count > 5) { -- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); -+// You are going to see this often enough on Unslung that we might as well put it in -+// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 -+// -+ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); - break; - } - } diff --git a/recipes/zd1211/zd1211_r77.bb b/recipes/zd1211/zd1211_r77.bb index 4755f01538..8321f8d96c 100644 --- a/recipes/zd1211/zd1211_r77.bb +++ b/recipes/zd1211/zd1211_r77.bb @@ -9,12 +9,6 @@ SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://makefile.patch;patch=1 \ " -SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile-unslung.patch;patch=1 \ - file://unslung-iwpriv-hack.patch;patch=1 \ - file://unslung-writel-logging.patch;patch=1 \ - " - S = "${WORKDIR}/zd1211-driver-${PV}" inherit module diff --git a/recipes/zd1211/zd1211_r83.bb b/recipes/zd1211/zd1211_r83.bb index d0d875c842..0f7bb7d5c8 100644 --- a/recipes/zd1211/zd1211_r83.bb +++ b/recipes/zd1211/zd1211_r83.bb @@ -8,10 +8,6 @@ PR = "r1" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://makefile.patch;patch=1" -SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile-unslung.patch;patch=1 \ - file://unslung-iwpriv-hack.patch;patch=1 \ - file://unslung-writel-logging.patch;patch=1" S = "${WORKDIR}/zd1211-driver-${PV}" diff --git a/recipes/zd1211/zd1211_r85.bb b/recipes/zd1211/zd1211_r85.bb index d0d875c842..0f7bb7d5c8 100644 --- a/recipes/zd1211/zd1211_r85.bb +++ b/recipes/zd1211/zd1211_r85.bb @@ -8,10 +8,6 @@ PR = "r1" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://makefile.patch;patch=1" -SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile-unslung.patch;patch=1 \ - file://unslung-iwpriv-hack.patch;patch=1 \ - file://unslung-writel-logging.patch;patch=1" S = "${WORKDIR}/zd1211-driver-${PV}" |
