Several fixes

Revert few useless changes
Fix file list
2026-04-28 14:33:34 +00:00 · 2013-10-28 17:42:40 +01:00 · 2013-10-28 17:06:27 +01:00 · 2013-10-28 17:03:22 +01:00 · 2013-10-28 16:49:58 +01:00 · 2013-10-28 16:46:36 +01:00
1962 changed files with 346108 additions and 70988 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,11 +9,10 @@
 aclocal.m4
 ahci_test
 ascii.bitmaps
-ascii.h
+asciifont.h
 autom4te.cache
-build-grub-gen-asciih
-build-grub-gen-widthspec
-build-grub-mkfont
+build_env.mk
+.bzrignore
 cdboot_test
 cmp_test
 config.cache
@@ -31,63 +30,47 @@ docs/*.info
 docs/stamp-vti
 docs/version.texi
 ehci_test
+*.elf
 example_grub_script_test
 example_scripted_test
 example_unit_test
 *.exec
-*.exec.exe
 fddboot_test
 genkernsyms.sh
 gensymlist.sh
 gentrigtables
-gentrigtables.exe
 gettext_strings_test
 grub-bin2h
-/grub-bios-setup
-/grub-bios-setup.exe
+grub-bios-setup
 grub_cmd_date
 grub_cmd_echo
 grub_cmd_regexp
 grub_cmd_set_date
 grub_cmd_sleep
-/grub-editenv
-/grub-editenv.exe
+grub-editenv
 grub-emu
-grub-emu-lite
-grub-emu.exe
-grub-emu-lite.exe
 grub_emu_init.c
 grub_emu_init.h
-/grub-file
-/grub-file.exe
 grub-fstest
-grub-fstest.exe
 grub_fstest_init.c
 grub_fstest_init.h
 grub_func_test
 grub-install
-grub-install.exe
 grub-kbdcomp
-/grub-macbless
-/grub-macbless.exe
 grub-macho2img
-/grub-menulst2cfg
-/grub-menulst2cfg.exe
-/grub-mk*
+grub-menulst2cfg
+grub-mk*
 grub-mount
-/grub-ofpathname
-/grub-ofpathname.exe
-grub-core/build-grub-pe2elf.exe
-/grub-probe
-/grub-probe.exe
+grub-ofpathname
+grub-pe2elf
+grub-probe
 grub_probe_init.c
 grub_probe_init.h
-/grub-reboot
+grub-reboot
 grub_script_blanklines
 grub_script_blockarg
 grub_script_break
 grub-script-check
-grub-script-check.exe
 grub_script_check_init.c
 grub_script_check_init.h
 grub_script_comments
@@ -118,20 +101,17 @@ grub_script.tab.h
 grub_script.yy.c
 grub_script.yy.h
 grub-set-default
+grub-setup
 grub_setup_init.c
 grub_setup_init.h
 grub-shell
 grub-shell-tester
 grub-sparc64-setup
-grub-sparc64-setup.exe
-/grub-syslinux2cfg
-/grub-syslinux2cfg.exe
 gzcompress_test
 hddboot_test
 help_test
 *.img
 *.image
-*.image.exe
 include/grub/cpu
 include/grub/machine
 install-sh
@@ -147,7 +127,6 @@ mod-*.c
 missing
 netboot_test
 *.o
-*.a
 ohci_test
 partmap_test
 pata_test
@@ -176,15 +155,16 @@ GPATH
 GRTAGS
 GSYMS
 GTAGS
+Makefile.tpl
 compile
 depcomp
 mdate-sh
 texinfo.tex
 grub-core/lib/libgcrypt-grub
-.deps
-.deps-util
-.deps-core
-.dirstamp
+**/.deps
+**/.deps-util
+**/.deps-core
+**/.dirstamp
 Makefile.util.am
 contrib
 grub-core/bootinfo.txt
@@ -198,9 +178,7 @@ grub-core/gmodule.pl
 grub-core/grub.chrp
 grub-core/modinfo.sh
 grub-core/*.module
-grub-core/*.module.exe
 grub-core/*.pp
-grub-core/kernel.img.bin
 util/bash-completion.d/grub
 grub-core/gnulib/alloca.h
 grub-core/gnulib/arg-nonnull.h
@@ -221,7 +199,7 @@ grub-core/gnulib/unistd.h
 grub-core/gnulib/warn-on-use.h
 grub-core/gnulib/wchar.h
 grub-core/gnulib/wctype.h
-grub-core/rs_decoder.h
+grub-core/rs_decoder.S
 widthspec.bin
 widthspec.h
 docs/stamp-1
@@ -235,15 +213,9 @@ include/grub/gcrypt/gcrypt.h
 include/grub/gcrypt/g10lib.h
 po/POTFILES.in
 po/POTFILES-shell.in
-/grub-glue-efi
-/grub-render-label
-/grub-glue-efi.exe
-/grub-render-label.exe
+grub-glue-efi
+grub-render-label
 grub-core/gnulib/locale.h
 grub-core/gnulib/unitypes.h
 grub-core/gnulib/uniwidth.h
 build-aux/test-driver
-/garbage-gen
-/garbage-gen.exe
-/grub-fs-tester
-grub-core/build-grub-module-verifier
--- a/4016
+++ b/4016
--- a/46
+++ b/46
@@ -12,33 +12,12 @@ you don't have any of them, please obtain and install them before
 configuring the GRUB.

 * GCC 4.1.3 or later
-  Note: older versions may work but support is limited
-
-  Experimental support for clang 3.3 or later (results in much bigger binaries)
-  for i386, x86_64, arm (including thumb), arm64, mips(el), powerpc, sparc64
-  Note: clang 3.2 or later works for i386 and x86_64 targets but results in
-        much bigger binaries.
-	earlier versions not tested
-  Note: clang 3.2 or later works for arm
-	earlier versions not tested
-  Note: clang on arm64 is not supported due to
-	https://llvm.org/bugs/show_bug.cgi?id=26030
-  Note: clang 3.3 or later works for mips(el)
-	earlier versions fail to generate .reginfo and hence gprel relocations
-	fail.
-  Note: clang 3.2 or later works for powerpc
-	earlier versions not tested
-  Note: clang 3.5 or later works for sparc64
-        earlier versions return "error: unable to interface with target machine"
-  Note: clang has no support for ia64 and hence you can't compile GRUB
-	for ia64 with clang
 * GNU Make
 * GNU Bison 2.3 or later
 * GNU gettext 0.17 or later
 * GNU binutils 2.9.1.0.23 or later
 * Flex 2.5.35 or later
 * Other standard GNU/Unix tools
-* a libc with large file support (e.g. glibc 2.1 or later)

 On GNU/Linux, you also need:

@@ -58,9 +37,10 @@ To build GRUB's graphical terminal (gfxterm), you need:
 If you use a development snapshot or want to hack on GRUB you may
 need the following.

-* Python 2.6 or later
+* Python 2.5.2 or later
 * Autoconf 2.60 or later
 * Automake 1.10.1 or later
+* Autogen 5.10 or later

 Prerequisites for make-check:

@@ -103,9 +83,6 @@ The simplest way to compile this package is:
  
  3. Type `./autogen.sh'.

-     * autogen.sh uses python. By default invocation is "python" but can be
-       overriden by setting variable $PYTHON.
-
  4. Type `./configure' to configure the package for your system.
     If you're using `csh' on an old version of System V, you might
     need to type `sh ./configure' instead to prevent `csh' from trying
@@ -147,7 +124,7 @@ If build and host are different make check isn't available.
 If build and host are different man pages are not generated.

 As an example imagine you have a build system running on FreeBSD on sparc
-which prepares packages for developers running amd64 GNU/Linux laptop and
+which prepares packages for developpers running amd64 GNU/Linux laptop and
 they need to make images for ARM board running U-boot. In this case:

 build=sparc64-freebsd
@@ -156,7 +133,7 @@ target=arm-uboot

 For this example the configure line might look like (more details below)
 (some options are optional and included here for completeness but some rarely
-used options are omitted):
+used options are omited):

 ./configure BUILD_CC=gcc BUILD_FREETYPE=freetype-config --host=amd64-linux-gnu
 CC=amd64-linux-gnu-gcc CFLAGS="-g -O2" FREETYPE=amd64-linux-gnu-freetype-config
@@ -175,15 +152,14 @@ corresponding platform are not needed for the platform in question.
       generate sin and cos tables.
    2. BUILD_CFLAGS= for C options for build.
    3. BUILD_CPPFLAGS= for C preprocessor options for build.
-    4. BUILD_LDFLAGS= for linker options for build.
-    5. BUILD_FREETYPE= for freetype-config for build (optional).
+    4. BUILD_FREETYPE= for freetype-config for build (optional).

  - For host
    1. --host= to autoconf name of host.
    2. CC= for gcc able to compile for host
-    3. HOST_CFLAGS= for C options for host.
-    4. HOST_CPPFLAGS= for C preprocessor options for host.
-    5. HOST_LDFLAGS= for linker options for host.
+    3. CFLAGS= for C options for host.
+    4. CPPFLAGS= for C preprocessor options for host.
+    5. LDFLAGS= for linker options for host.
    6. FREETYPE= for freetype-config for host (optional).
    7. Libdevmapper if any must be in standard linker folders (-ldevmapper) (optional).
    8. Libfuse if any must be in standard linker folders (-lfuse) (optional).
@@ -204,9 +180,9 @@ corresponding platform are not needed for the platform in question.
    11. TARGET_RANLIB= for ranlib for target.

  - Additionally for emu, for host and target.
-    1. SDL is looked for in standard linker directories (-lSDL) (optional)
-    2. libpciaccess is looked for in standard linker directories (-lpciaccess) (optional)
-    3. libusb is looked for in standard linker directories (-lusb) (optional)
+    1. SDL is looked for in stadard linker directories (-lSDL) (optional)
+    2. libpciaccess is looked for in stadard linker directories (-lpciaccess) (optional)
+    3. libusb is looked for in stadard linker directories (-lusb) (optional)

  - Platform-agnostic tools and data.
    1. make is the tool you execute after ./configure.
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,7 @@
 AUTOMAKE_OPTIONS = subdir-objects -Wno-portability

 DEPDIR = .deps-util
-SUBDIRS = grub-core/gnulib .
-if COND_real_platform
-SUBDIRS += grub-core
-endif
-SUBDIRS += po docs util/bash-completion.d
+SUBDIRS = grub-core/gnulib . grub-core po docs util/bash-completion.d

 include $(top_srcdir)/conf/Makefile.common
 include $(top_srcdir)/conf/Makefile.extra-dist
@@ -70,191 +66,169 @@ endif

 starfield_theme_files = $(srcdir)/themes/starfield/blob_w.png $(srcdir)/themes/starfield/boot_menu_c.png $(srcdir)/themes/starfield/boot_menu_e.png $(srcdir)/themes/starfield/boot_menu_ne.png $(srcdir)/themes/starfield/boot_menu_n.png $(srcdir)/themes/starfield/boot_menu_nw.png $(srcdir)/themes/starfield/boot_menu_se.png $(srcdir)/themes/starfield/boot_menu_s.png $(srcdir)/themes/starfield/boot_menu_sw.png $(srcdir)/themes/starfield/boot_menu_w.png $(srcdir)/themes/starfield/slider_c.png $(srcdir)/themes/starfield/slider_n.png $(srcdir)/themes/starfield/slider_s.png $(srcdir)/themes/starfield/starfield.png $(srcdir)/themes/starfield/terminal_box_c.png $(srcdir)/themes/starfield/terminal_box_e.png $(srcdir)/themes/starfield/terminal_box_ne.png $(srcdir)/themes/starfield/terminal_box_n.png $(srcdir)/themes/starfield/terminal_box_nw.png $(srcdir)/themes/starfield/terminal_box_se.png $(srcdir)/themes/starfield/terminal_box_s.png $(srcdir)/themes/starfield/terminal_box_sw.png $(srcdir)/themes/starfield/terminal_box_w.png $(srcdir)/themes/starfield/theme.txt $(srcdir)/themes/starfield/README $(srcdir)/themes/starfield/COPYING.CC-BY-SA-3.0

-build-grub-mkfont$(BUILD_EXEEXT): util/grub-mkfont.c grub-core/unidata.c grub-core/kern/emu/misc.c util/misc.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(build_freetype_cflags) $(build_freetype_libs)
-CLEANFILES += build-grub-mkfont$(BUILD_EXEEXT)
+build-grub-mkfont: util/grub-mkfont.c grub-core/unidata.c grub-core/kern/emu/misc.c util/misc.c
+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(build_freetype_cflags) $(build_freetype_libs)

-garbage-gen$(BUILD_EXEEXT): util/garbage-gen.c
-	$(BUILD_CC) -o $@ $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS)  $^
-CLEANFILES += garbage-gen$(BUILD_EXEEXT)
-EXTRA_DIST += util/garbage-gen.c
+build-grub-gen-asciih: util/grub-gen-asciih.c
+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror

-build-grub-gen-asciih$(BUILD_EXEEXT): util/grub-gen-asciih.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
-CLEANFILES += build-grub-gen-asciih$(BUILD_EXEEXT)
-
-build-grub-gen-widthspec$(BUILD_EXEEXT): util/grub-gen-widthspec.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
-CLEANFILES += build-grub-gen-widthspec$(BUILD_EXEEXT)
+build-grub-gen-widthspec: util/grub-gen-widthspec.c
+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror

 if COND_STARFIELD
 starfield_DATA = dejavu_10.pf2 dejavu_12.pf2 dejavu_bold_14.pf2 dejavu_14.pf2 dejavu_16.pf2 $(starfield_theme_files)
-dejavu_10.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
-	./build-grub-mkfont$(BUILD_EXEEXT) -s 10 -o $@ $(DJVU_FONT_SOURCE)
-CLEANFILES += dejavu_10.pf2
-dejavu_12.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
-	./build-grub-mkfont$(BUILD_EXEEXT) -s 12 -o $@ $(DJVU_FONT_SOURCE)
-CLEANFILES += dejavu_12.pf2
-dejavu_14.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
-	./build-grub-mkfont$(BUILD_EXEEXT) -s 14 -o $@ $(DJVU_FONT_SOURCE)
-CLEANFILES += dejavu_14.pf2
-dejavu_bold_14.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
-	./build-grub-mkfont$(BUILD_EXEEXT) -b -s 14 -o $@ $(DJVU_FONT_SOURCE)
-CLEANFILES += dejavu_bold_14.pf2
-dejavu_16.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
-	./build-grub-mkfont$(BUILD_EXEEXT) -s 16 -o $@ $(DJVU_FONT_SOURCE)
-CLEANFILES += dejavu_16.pf2
+dejavu_10.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont
+	./build-grub-mkfont -s 10 -o $@ $(DJVU_FONT_SOURCE)
+dejavu_12.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont
+	./build-grub-mkfont -s 12 -o $@ $(DJVU_FONT_SOURCE)
+dejavu_14.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont
+	./build-grub-mkfont -s 14 -o $@ $(DJVU_FONT_SOURCE)
+dejavu_bold_14.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont
+	./build-grub-mkfont -b -s 14 -o $@ $(DJVU_FONT_SOURCE)
+dejavu_16.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont
+	./build-grub-mkfont -s 16 -o $@ $(DJVU_FONT_SOURCE)
 else
-starfield_DATA =
+starfield_DATA = 
 endif

 EXTRA_DIST += $(starfield_theme_files)
 EXTRA_DIST += $(srcdir)/themes/starfield/src/slider_s.xcf $(srcdir)/themes/starfield/src/slider_n.xcf $(srcdir)/themes/starfield/src/slider_c.xcf $(srcdir)/themes/starfield/src/blob_nw.xcf $(srcdir)/themes/starfield/src/bootmenu/center.xcf $(srcdir)/themes/starfield/src/bootmenu/corner.xcf $(srcdir)/themes/starfield/src/bootmenu/side.xcf $(srcdir)/themes/starfield/src/terminalbox/side.xcf $(srcdir)/themes/starfield/src/terminalbox/corner.xcf $(srcdir)/themes/starfield/src/terminalbox/center.xcf

-unicode.pf2: $(FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
-	./build-grub-mkfont$(BUILD_EXEEXT) -o $@ $(FONT_SOURCE) || (rm -f $@; exit 1)
+unicode.pf2: $(FONT_SOURCE) build-grub-mkfont
+	./build-grub-mkfont -o $@ $(FONT_SOURCE)
 CLEANFILES += unicode.pf2

 # Arrows and lines are needed to draw the menu, so always include them
 UNICODE_ARROWS=0x2190-0x2193
 UNICODE_LINES=0x2501-0x251B

-ascii.pf2: $(FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
-	./build-grub-mkfont$(BUILD_EXEEXT) -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES) || (rm -f $@; exit 1)
+ascii.pf2: $(FONT_SOURCE) build-grub-mkfont
+	./build-grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
 CLEANFILES += ascii.pf2

-euro.pf2: $(FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
-	./build-grub-mkfont$(BUILD_EXEEXT) -o $@ $(FONT_SOURCE) -r 0x0-0x4ff,0x1e00-0x1fff,$(UNICODE_ARROWS),$(UNICODE_LINES) || (rm -f $@; exit 1)
+euro.pf2: $(FONT_SOURCE) build-grub-mkfont
+	./build-grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x4ff,0x1e00-0x1fff,$(UNICODE_ARROWS),$(UNICODE_LINES)
 CLEANFILES += euro.pf2

-ascii.h: $(FONT_SOURCE) build-grub-gen-asciih$(BUILD_EXEEXT)
-	./build-grub-gen-asciih$(BUILD_EXEEXT) $(FONT_SOURCE) $@ || (rm -f $@; exit 1)
+ascii.h: $(FONT_SOURCE) build-grub-gen-asciih
+	./build-grub-gen-asciih $(FONT_SOURCE) $@ 
 CLEANFILES += ascii.h

-widthspec.h: $(FONT_SOURCE) build-grub-gen-widthspec$(BUILD_EXEEXT)
-	./build-grub-gen-widthspec$(BUILD_EXEEXT) $(FONT_SOURCE) $@ || (rm -f $@; exit 1)
+widthspec.h: $(FONT_SOURCE) build-grub-gen-widthspec
+	./build-grub-gen-widthspec $(FONT_SOURCE) $@ 
 CLEANFILES += widthspec.h

 # Install config.h into platformdir
-nodist_platform_HEADERS = config.h
+platform_HEADERS = config.h

 pkgdata_DATA += grub-mkconfig_lib


-if COND_real_platform
-
 if COND_i386_coreboot
 QEMU32=qemu-system-i386
-MINIMUM_CPU_LINUX=pentium2
 endif

 if COND_i386_multiboot
 QEMU32=qemu-system-i386
-MINIMUM_CPU_LINUX=pentium2
 endif

 if COND_i386_ieee1275
 QEMU32=qemu-system-i386
-MINIMUM_CPU_LINUX=pentium2
 endif

 if COND_i386_qemu
 QEMU32=qemu-system-i386
-MINIMUM_CPU_LINUX=pentium2
 endif

 if COND_i386_pc
 QEMU32=qemu-system-i386
-MINIMUM_CPU_LINUX=pentium2
 endif

 if COND_i386_efi
 QEMU32=qemu-system-i386
-MINIMUM_CPU_LINUX=pentium2
 endif

 if COND_x86_64_efi
 QEMU32=qemu-system-x86_64
-MINIMUM_CPU_LINUX=core2duo
 endif

 linux.init.x86_64: $(srcdir)/grub-core/tests/boot/linux.init-x86_64.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -static -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"

 linux.init.i386: $(srcdir)/grub-core/tests/boot/linux.init-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -static -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"

 linux.init.mips: $(srcdir)/grub-core/tests/boot/linux.init-mips.S
-	$(TARGET_CC) -o $@ $< -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"

 linux.init.ppc: $(srcdir)/grub-core/tests/boot/linux.init-ppc.S
-	$(TARGET_CC) -o $@ $< -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"

 linux.init.mipsel: $(srcdir)/grub-core/tests/boot/linux.init-mips.S
-	$(TARGET_CC) -o $@ $< -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"

 linux.init.loongson: $(srcdir)/grub-core/tests/boot/linux.init-mips.S
-	$(TARGET_CC) -o $@ $< -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -DREBOOT=1
+	$(TARGET_CC) -o $@ $< -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -DREBOOT=1

 multiboot.elf: $(srcdir)/grub-core/tests/boot/kernel-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -static -ffreestanding -nostdlib -nostdinc -DTARGET_MULTIBOOT=1 -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
+	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -DTARGET_MULTIBOOT=1 -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include

 kfreebsd.elf: $(srcdir)/grub-core/tests/boot/kernel-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -static -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
+	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include

 kfreebsd.aout: kfreebsd.elf
-	$(TARGET_OBJCOPY) -O a.out-i386-linux $< $@ -j .text
+	$(TARGET_OBJCOPY) -O a.out-i386-linux $< $@ -R .note.gnu.build-id -R .note.gnu.gold-version

 pc-chainloader.elf: $(srcdir)/grub-core/tests/boot/kernel-8086.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -static -DTARGET_CHAINLOADER=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x7c00 -m32
+	$(TARGET_CC) -o $@ $< -DTARGET_CHAINLOADER=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x7c00 -m32

 pc-chainloader.bin: pc-chainloader.elf
 	$(TARGET_OBJCOPY) -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn -R .note.gnu.gold-version $< $@;

 ntldr.elf: $(srcdir)/grub-core/tests/boot/kernel-8086.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -DTARGET_NTLDR=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -static -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0 -m32
+	$(TARGET_CC) -o $@ $< -DTARGET_NTLDR=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0 -m32

 ntldr.bin: ntldr.elf
-	$(TARGET_OBJCOPY) -O binary --strip-unneeded -j .text $< $@;
+	$(TARGET_OBJCOPY) -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn -R .note.gnu.gold-version $< $@;

 multiboot2.elf: $(srcdir)/grub-core/tests/boot/kernel-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -static -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include -DTARGET_MULTIBOOT2=1
+	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include -DTARGET_MULTIBOOT2=1

 kfreebsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kfreebsd.init-x86_64.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -m64 -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
+	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@

 kfreebsd.init.i386: $(srcdir)/grub-core/tests/boot/kfreebsd.init-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -m32 -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@

 knetbsd.init.i386: $(srcdir)/grub-core/tests/boot/kbsd.init-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -m32 -static -nostdlib -nostdinc -DTARGET_NETBSD=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DTARGET_NETBSD=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"

 kopenbsd.init.i386: $(srcdir)/grub-core/tests/boot/kbsd.init-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -m32 -static -nostdlib -nostdinc -DTARGET_OPENBSD=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DTARGET_OPENBSD=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"

 knetbsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kbsd.init-x86_64.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -m64 -DTARGET_NETBSD=1 -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -m64 -DTARGET_NETBSD=1 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"

 kopenbsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kbsd.init-x86_64.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -m64 -DTARGET_OPENBSD=1 -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -m64 -DTARGET_OPENBSD=1 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"

 linux-initramfs.mips: linux.init.mips Makefile
-	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio -R 0:0 --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR

 linux-initramfs.ppc: linux.init.ppc Makefile
-	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio -R 0:0 --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR

 linux-initramfs.mipsel: linux.init.mipsel Makefile
-	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio -R 0:0 --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR

 linux-initramfs.loongson: linux.init.loongson Makefile
-	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio -R 0:0 --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR

 linux-initramfs.i386: linux.init.i386 Makefile
-	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio -R 0:0 --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR

 linux-initramfs.x86_64: linux.init.x86_64 Makefile
-	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio -R 0:0 --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR

 kfreebsd-mfsroot.i386.img: kfreebsd.init.i386 Makefile
 	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
@@ -313,7 +287,7 @@ bootcheck-knetbsd-x86_64: knetbsd.miniroot-image.x86_64.gz $(GRUB_PAYLOADS_DIR)/
 	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=qemu-system-x86_64 --files=/miniroot.gz=knetbsd.miniroot-image.x86_64.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/grub-core/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null

 bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
-	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux.cfg --qemu-opts="-cpu $(MINIMUM_CPU_LINUX)" | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null

 bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
 	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
@@ -352,41 +326,33 @@ bootcheck-ntldr: ntldr.bin $(srcdir)/grub-core/tests/boot/ntldr.cfg grub-shell
 	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=$(QEMU32) --files=/ntldr.bin=ntldr.bin $(srcdir)/grub-core/tests/boot/ntldr.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null

 if COND_i386_efi
-# NetBSD has no support for finding ACPI on EFI
-BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64 bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-kfreebsd-x86_64 bootcheck-kfreebsd-i386
-endif
-
-if COND_x86_64_efi
-# NetBSD has no support for finding ACPI on EFI
-BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64 bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-kfreebsd-x86_64 bootcheck-kfreebsd-i386
-endif
-
-if COND_i386_multiboot
-# *BSD requires ACPI
-BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64
-endif
-
-
-if COND_i386_qemu
-# *BSD requires ACPI
-BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64
-endif
-
-if COND_i386_coreboot
 BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64 bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-knetbsd-x86_64 bootcheck-kfreebsd-x86_64 bootcheck-kfreebsd-i386
 endif

-if COND_i386_ieee1275
-# *BSD requires ACPI
-#legacy protocol (linux16) makes early BIOS calls.
-BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64
+if COND_x86_64_efi
+BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64 bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-knetbsd-x86_64 bootcheck-kfreebsd-x86_64 bootcheck-kfreebsd-i386
+endif
+
+if COND_i386_multiboot
+# FreeBSD requires ACPI
+BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64 bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-knetbsd-x86_64
+endif
+
+if COND_i386_coreboot
+# Freebsd requires ACPI
+BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64 bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-knetbsd-x86_64
+endif
+
+if COND_i386_qemu
+# FreeBSD requires ACPI
+BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64 bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-knetbsd-x86_64
 endif

 if COND_i386_pc
 #pc chainloader by definition is only for i386-pc
 #ntldr and bootmgr require BIOS.
-#legacy protocol (linux16) makes early BIOS calls.
-# 32-bit NetBSD crashes early on non-BIOS
+#legacy protocol makes early BIOS calls.
+# NetBSD crashes early on non-BIOS
 BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64 bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-knetbsd-x86_64 bootcheck-kfreebsd-x86_64 bootcheck-kfreebsd-i386 bootcheck-pc-chainloader bootcheck-ntldr bootcheck-linux16-i386 bootcheck-linux16-x86_64 bootcheck-knetbsd-i386
 endif

@@ -409,10 +375,12 @@ if COND_powerpc_ieee1275
 BOOTCHECKS = bootcheck-linux-ppc
 endif

+EXTRA_DIST += grub-core/tests/boot/kbsd.init-i386.S grub-core/tests/boot/kbsd.init-x86_64.S grub-core/tests/boot/kbsd.spec.txt grub-core/tests/boot/kernel-8086.S grub-core/tests/boot/kernel-i386.S grub-core/tests/boot/kfreebsd-aout.cfg grub-core/tests/boot/kfreebsd.cfg grub-core/tests/boot/kfreebsd.init-i386.S grub-core/tests/boot/kfreebsd.init-x86_64.S grub-core/tests/boot/knetbsd.cfg grub-core/tests/boot/kopenbsd.cfg grub-core/tests/boot/kopenbsdlabel.txt grub-core/tests/boot/linux16.cfg grub-core/tests/boot/linux.cfg grub-core/tests/boot/linux.init-i386.S grub-core/tests/boot/linux.init-mips.S grub-core/tests/boot/linux.init-ppc.S grub-core/tests/boot/linux.init-x86_64.S grub-core/tests/boot/linux-ppc.cfg grub-core/tests/boot/multiboot2.cfg grub-core/tests/boot/multiboot.cfg grub-core/tests/boot/ntldr.cfg grub-core/tests/boot/pc-chainloader.cfg grub-core/tests/boot/qemu-shutdown-x86.S
+
 .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
       bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
       bootcheck-knetbsd-i386 bootcheck-knetbsd-x86_64 \
-	bootcheck-linux-mips FORCE
+	bootcheck-linux-mips

 # Randomly generated
 SUCCESSFUL_BOOT_STRING=3e49994fd5d82b7c9298d672d774080d
@@ -421,61 +389,4 @@ BOOTCHECK_TIMEOUT=180

 bootcheck: $(BOOTCHECKS)

-if COND_i386_coreboot
-default_payload.elf: grub-mkstandalone grub-mkimage FORCE
-	test -f $@ && rm $@ || true
-	pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(shell cat grub-core/fs.lst) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
-endif
-
-endif
-
-EXTRA_DIST += grub-core/tests/boot/kbsd.init-i386.S grub-core/tests/boot/kbsd.init-x86_64.S grub-core/tests/boot/kbsd.spec.txt grub-core/tests/boot/kernel-8086.S grub-core/tests/boot/kernel-i386.S grub-core/tests/boot/kfreebsd-aout.cfg grub-core/tests/boot/kfreebsd.cfg grub-core/tests/boot/kfreebsd.init-i386.S grub-core/tests/boot/kfreebsd.init-x86_64.S grub-core/tests/boot/knetbsd.cfg grub-core/tests/boot/kopenbsd.cfg grub-core/tests/boot/kopenbsdlabel.txt grub-core/tests/boot/linux16.cfg grub-core/tests/boot/linux.cfg grub-core/tests/boot/linux.init-i386.S grub-core/tests/boot/linux.init-mips.S grub-core/tests/boot/linux.init-ppc.S grub-core/tests/boot/linux.init-x86_64.S grub-core/tests/boot/linux-ppc.cfg grub-core/tests/boot/multiboot2.cfg grub-core/tests/boot/multiboot.cfg grub-core/tests/boot/ntldr.cfg grub-core/tests/boot/pc-chainloader.cfg grub-core/tests/boot/qemu-shutdown-x86.S
-
-windowsdir=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows
-windowsdir: $(PROGRAMS) $(starfield_DATA) $(platform_DATA)
-	test -d $(windowsdir) && rm -rf $(windowsdir) || true
-	test -d $(windowsdir) || mkdir $(windowsdir)
-	$(MAKE) -C po $(AM_MAKEFLAGS) windowsdir
-	$(MAKE) -C grub-core $(AM_MAKEFLAGS) windowsdir
-	test -d $(windowsdir)/themes || mkdir $(windowsdir)/themes
-	test -d $(windowsdir)/themes/starfield || mkdir $(windowsdir)/themes/starfield
-	for x in $(PROGRAMS); do \
-		if [ x$(STRIP) != x ]; then $(STRIP) $$x -o $(windowsdir)/$$x; \
-		else cp -fp $$x $(windowsdir)/$$x; fi; \
-	done
-	for x in $(pkgdata_DATA); do \
-		cp -fp $$x $(windowsdir)/$$x; \
-	done
-	for x in $(starfield_DATA); do \
-		cp -fp $$x $(windowsdir)/themes/starfield/$$(basename $$x); \
-	done
-	for x in $(GRUB_WINDOWS_EXTRA_DIST); do \
-		cp -fp $$x $(windowsdir); \
-	done
-
-windowszip=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows.zip
-windowszip: windowsdir
-	test -f $(windowszip) && rm $(windowszip) || true
-	zip -r $(windowszip) $(windowsdir)
-	rm -rf $(windowsdir)
-
 EXTRA_DIST += linguas.sh
-
-changelog_start_date = 2015-01-23
-gitlog_to_changelog = $(top_srcdir)/build-aux/gitlog-to-changelog
-
-ChangeLog: FORCE
-	if test -d $(top_srcdir)/.git; then \
-		$(gitlog_to_changelog) --srcdir=$(top_srcdir) --since=$(changelog_start_date) > '$@.tmp'; \
-		rm -f '$@'; mv '$@.tmp' '$@'; \
-	else \
-		touch $@; \
-	fi
-
-EXTRA_DIST += ChangeLog ChangeLog-2015
-
-syslinux_test: $(top_builddir)/config.status tests/syslinux/ubuntu10.04_grub.cfg
-
-tests/syslinux/ubuntu10.04_grub.cfg: $(top_builddir)/config.status tests/syslinux/ubuntu10.04_grub.cfg.in
-	(for x in tests/syslinux/ubuntu10.04_grub.cfg.in ; do cat $(srcdir)/"$$x"; done) | $(top_builddir)/config.status --file=$@:-
-CLEANFILES += tests/syslinux/ubuntu10.04_grub.cfg
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -48,7 +48,6 @@ library = {
  common = grub-core/partmap/gpt.c;
  common = grub-core/partmap/msdos.c;
  common = grub-core/fs/proc.c;
-  common = grub-core/fs/archelp.c;
 };

 library = {
@@ -63,7 +62,6 @@ library = {
  common_nodist = grub_script.tab.h;

  common = grub-core/commands/blocklist.c;
-  common = grub-core/commands/macbless.c;
  common = grub-core/commands/xnu_uuid.c;
  common = grub-core/commands/testload.c;
  common = grub-core/commands/ls.c;
@@ -92,6 +90,7 @@ library = {
  common = grub-core/fs/bfs.c;
  common = grub-core/fs/btrfs.c;
  common = grub-core/fs/cbfs.c;
+  common = grub-core/fs/archelp.c;
  common = grub-core/fs/cpio.c;
  common = grub-core/fs/cpio_be.c;
  common = grub-core/fs/odc.c;
@@ -155,11 +154,8 @@ library = {
  common = grub-core/script/script.c;
  common = grub-core/script/argv.c;
  common = grub-core/io/gzio.c;
-  common = grub-core/io/xzio.c;
  common = grub-core/io/lzopio.c;
  common = grub-core/kern/ia64/dl_helper.c;
-  common = grub-core/kern/arm/dl_helper.c;
-  common = grub-core/kern/arm64/dl_helper.c;
  common = grub-core/lib/minilzo/minilzo.c;
  common = grub-core/lib/xzembed/xz_dec_bcj.c;
  common = grub-core/lib/xzembed/xz_dec_lzma2.c;
@@ -172,16 +168,11 @@ program = {

  common = util/grub-mkimage.c;
  common = util/mkimage.c;
-  common = util/grub-mkimage32.c;
-  common = util/grub-mkimage64.c;
  common = util/resolve.c;
  common = grub-core/kern/emu/argp_common.c;
  common = grub-core/osdep/init.c;
-  common = grub-core/osdep/config.c;
-  extra_dist = grub-core/osdep/aros/config.c;
-  extra_dist = grub-core/osdep/windows/config.c;
-  extra_dist = grub-core/osdep/unix/config.c;
-  common = util/config.c;
+
+  common = grub-core/kern/arm/dl_helper.c;

  extra_dist = util/grub-mkimagexx.c;

@@ -259,7 +250,7 @@ program = {
  name = grub-macho2img;
  mansection = 1;
  common = util/grub-macho2img.c;
-  condition = COND_APPLE_LINKER;
+  condition = COND_APPLE_CC;
 };

 program = {
@@ -319,7 +310,6 @@ program = {
  installdir = sbin;
  mansection = 8;
  common = util/grub-probe.c;
-  common = util/probe.c;
  common = grub-core/osdep/ofpath.c;
  common = grub-core/kern/emu/argp_common.c;
  common = grub-core/osdep/init.c;
@@ -386,7 +376,7 @@ program = {
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBGEOM)';
 };

 program = {
@@ -404,21 +394,6 @@ program = {
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };

-program = {
-  name = grub-macbless;
-  installdir = sbin;
-  mansection = 8;
-  common = util/grub-macbless.c;
-  common = grub-core/osdep/init.c;
-  common = grub-core/kern/emu/argp_common.c;
-
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-};
-
 data = {
  common = util/grub.d/README;
  installdir = grubconf;
@@ -504,168 +479,38 @@ script = {
  installdir = grubconf;
 };

-program = {
+script = {
  mansection = 1;
  name = grub-mkrescue;
-
-  common = util/grub-mkrescue.c;
-  common = util/render-label.c;
-  common = util/glue-efi.c;
-  common = util/mkimage.c;
-  common = util/grub-mkimage32.c;
-  common = util/grub-mkimage64.c;
-  common = util/grub-install-common.c;
-  common = util/setup_bios.c;
-  common = util/setup_sparc.c;
-  common = grub-core/lib/reed_solomon.c;
-  common = grub-core/osdep/random.c;
-  common = grub-core/osdep/ofpath.c;
-  common = grub-core/osdep/platform.c;
-  common = grub-core/osdep/platform_unix.c;
-  common = grub-core/osdep/compress.c;
-  extra_dist = grub-core/osdep/unix/compress.c;
-  extra_dist = grub-core/osdep/basic/compress.c;
-  common = util/editenv.c;
-  common = grub-core/osdep/blocklist.c;
-  common = grub-core/osdep/config.c;
-  common = util/config.c;
-
-  common = grub-core/kern/emu/hostfs.c;
-  common = grub-core/disk/host.c;
-
-  common = util/resolve.c;
-
-  common = grub-core/kern/emu/argp_common.c;
-  common = grub-core/osdep/init.c;
-
-  ldadd = '$(LIBLZMA)';
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-
-  condition = COND_HAVE_EXEC;
+  common = util/grub-install_header;
+  common = util/grub-mkrescue.in;
+  enable = noemu;
 };

-program = {
+script = {
  mansection = 1;
  name = grub-mkstandalone;
-  common = util/grub-mkstandalone.c;
-
-  common = util/render-label.c;
-  common = util/glue-efi.c;
-  common = util/mkimage.c;
-  common = util/grub-mkimage32.c;
-  common = util/grub-mkimage64.c;
-  common = util/grub-install-common.c;
-  common = util/setup_bios.c;
-  common = util/setup_sparc.c;
-  common = grub-core/lib/reed_solomon.c;
-  common = grub-core/osdep/random.c;
-  common = grub-core/osdep/ofpath.c;
-  common = grub-core/osdep/platform.c;
-  common = grub-core/osdep/platform_unix.c;
-  extra_dist = grub-core/osdep/linux/platform.c;
-  extra_dist = grub-core/osdep/windows/platform.c;
-  extra_dist = grub-core/osdep/basic/platform.c;
-  extra_dist = grub-core/osdep/basic/no_platform.c;
-  extra_dist = grub-core/osdep/unix/platform.c;
-  common = grub-core/osdep/compress.c;
-  common = util/editenv.c;
-  common = grub-core/osdep/blocklist.c;
-  common = grub-core/osdep/config.c;
-  common = util/config.c;
-
-  common = grub-core/kern/emu/hostfs.c;
-  common = grub-core/disk/host.c;
-
-  common = util/resolve.c;
-
-  common = grub-core/kern/emu/argp_common.c;
-  common = grub-core/osdep/init.c;
-
-  ldadd = '$(LIBLZMA)';
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  common = util/grub-install_header;
+  common = util/grub-mkstandalone.in;
 };

-program = {
+script = {
  mansection = 8;
  installdir = sbin;
  name = grub-install;

-  common = util/grub-install.c;
-  common = util/probe.c;
-  common = util/mkimage.c;
-  common = util/grub-mkimage32.c;
-  common = util/grub-mkimage64.c;
-  common = util/grub-install-common.c;
-  common = util/setup_bios.c;
-  common = util/setup_sparc.c;
-  common = grub-core/lib/reed_solomon.c;
-  common = grub-core/osdep/random.c;
-  common = grub-core/osdep/ofpath.c;
-  common = grub-core/osdep/platform.c;
-  common = grub-core/osdep/platform_unix.c;
-  common = grub-core/osdep/compress.c;
-  common = util/editenv.c;
-  common = grub-core/osdep/blocklist.c;
-  common = grub-core/osdep/config.c;
-  common = util/config.c;
-  common = util/render-label.c;
-  common = grub-core/kern/emu/hostfs.c;
-  common = grub-core/disk/host.c;
-
-  common = util/resolve.c;
-  common = grub-core/kern/emu/argp_common.c;
-  common = grub-core/osdep/init.c;
-
-  ldadd = '$(LIBLZMA)';
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  common = util/grub-install_header;
+  common = util/grub-install.in;
+  enable = noemu;
 };

-program = {
+script = {
  mansection = 1;
  installdir = bin;
  name = grub-mknetdir;

-  common = util/grub-mknetdir.c;
-
-  common = util/mkimage.c;
-  common = util/grub-mkimage32.c;
-  common = util/grub-mkimage64.c;
-  common = util/grub-install-common.c;
-  common = util/setup_bios.c;
-  common = util/setup_sparc.c;
-  common = grub-core/lib/reed_solomon.c;
-  common = grub-core/osdep/random.c;
-  common = grub-core/osdep/ofpath.c;
-  common = grub-core/osdep/platform.c;
-  common = grub-core/osdep/platform_unix.c;
-  common = grub-core/osdep/compress.c;
-  common = util/editenv.c;
-  common = grub-core/osdep/blocklist.c;
-  common = grub-core/osdep/config.c;
-  common = util/config.c;
-
-  common = util/resolve.c;
-  common = grub-core/kern/emu/argp_common.c;
-  common = grub-core/osdep/init.c;
-
-  ldadd = '$(LIBLZMA)';
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  common = util/grub-install_header;
+  common = util/grub-mknetdir.in;
 };

 script = {
@@ -713,127 +558,6 @@ script = {
  installdir = noinst;
 };

-script = {
-  name = grub-fs-tester;
-  common = tests/util/grub-fs-tester.in;
-  installdir = noinst;
-  dependencies = 'garbage-gen$(BUILD_EXEEXT)';
-};
-
-script = {
-  testcase;
-  name = ext234_test;
-  common = tests/ext234_test.in;
-};
-
-script = {
-  testcase;
-  name = squashfs_test;
-  common = tests/squashfs_test.in;
-};
-
-script = {
-  testcase;
-  name = iso9660_test;
-  common = tests/iso9660_test.in;
-};
-
-script = {
-  testcase;
-  name = hfsplus_test;
-  common = tests/hfsplus_test.in;
-};
-
-script = {
-  testcase;
-  name = ntfs_test;
-  common = tests/ntfs_test.in;
-};
-
-script = {
-  testcase;
-  name = reiserfs_test;
-  common = tests/reiserfs_test.in;
-};
-
-script = {
-  testcase;
-  name = fat_test;
-  common = tests/fat_test.in;
-};
-
-script = {
-  testcase;
-  name = minixfs_test;
-  common = tests/minixfs_test.in;
-};
-
-script = {
-  testcase;
-  name = xfs_test;
-  common = tests/xfs_test.in;
-};
-
-script = {
-  testcase;
-  name = nilfs2_test;
-  common = tests/nilfs2_test.in;
-};
-
-script = {
-  testcase;
-  name = romfs_test;
-  common = tests/romfs_test.in;
-};
-
-script = {
-  testcase;
-  name = exfat_test;
-  common = tests/exfat_test.in;
-};
-
-script = {
-  testcase;
-  name = tar_test;
-  common = tests/tar_test.in;
-};
-
-script = {
-  testcase;
-  name = udf_test;
-  common = tests/udf_test.in;
-};
-
-script = {
-  testcase;
-  name = hfs_test;
-  common = tests/hfs_test.in;
-};
-
-script = {
-  testcase;
-  name = jfs_test;
-  common = tests/jfs_test.in;
-};
-
-script = {
-  testcase;
-  name = btrfs_test;
-  common = tests/btrfs_test.in;
-};
-
-script = {
-  testcase;
-  name = zfs_test;
-  common = tests/zfs_test.in;
-};
-
-script = {
-  testcase;
-  name = cpio_test;
-  common = tests/cpio_test.in;
-};
-
 script = {
  testcase;
  name = example_scripted_test;
@@ -1159,24 +883,6 @@ script = {
  common = tests/grub_cmd_tr.in;
 };

-script = {
-  testcase;
-  name = file_filter_test;
-  common = tests/file_filter_test.in;
-};
-
-script = {
-  testcase;
-  name = grub_cmd_test;
-  common = tests/grub_cmd_test.in;
-};
-
-script = {
-  testcase;
-  name = syslinux_test;
-  common = tests/syslinux_test.in;
-};
-
 program = {
  testcase;
  name = example_unit_test;
@@ -1269,24 +975,6 @@ program = {
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };

-program = {
-  name = grub-syslinux2cfg;
-  mansection = 1;
-  common = util/grub-syslinux2cfg.c;
-  common = grub-core/lib/syslinux_parse.c;
-  common = grub-core/lib/getline.c;
-  common = grub-core/osdep/init.c;
-  common = grub-core/kern/emu/hostfs.c;
-  common = grub-core/disk/host.c;
-  common = grub-core/kern/emu/argp_common.c;
-
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-};
-
 program = {
  name = grub-glue-efi;
  mansection = 1;
@@ -1320,32 +1008,3 @@ program = {
  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
-
-program = {
-  name = grub-file;
-  mansection = 1;
-
-  common = util/grub-file.c;
-  common = util/render-label.c;
-  common = grub-core/commands/file.c;
-  common = grub-core/commands/file32.c;
-  common = grub-core/commands/file64.c;
-  common = grub-core/loader/i386/xen_file.c;
-  common = grub-core/loader/i386/xen_file32.c;
-  common = grub-core/loader/i386/xen_file64.c;
-  common = grub-core/io/offset.c;
-  common = grub-core/kern/elf.c;
-  common = grub-core/loader/lzss.c;
-  common = grub-core/loader/macho.c;
-  common = grub-core/loader/macho32.c;
-  common = grub-core/loader/macho64.c;
-  common = grub-core/kern/emu/hostfs.c;
-  common = grub-core/disk/host.c;
-  common = grub-core/osdep/init.c;
-
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-};
--- a/182
+++ b/182
@@ -1,182 +1,3 @@
-New in 2.02:
-
-* New/improved filesystem and disk support:
-  * Big-endian UFS1.
-  * Experimental 64-bit ext2 support.
-  * Various fixes for non-512-byte sector devices.
-  * New `proc' filesystem framework, used by LUKS disks.
-  * Fix DM-RAID partition handling.
-  * New `nativedisk' command to switch from firmware to native disk drivers.
-  * Compressed HFS+.
-  * DragonFly BSD labels.
-  * CBFS (coreboot).
-  * Handle partitioned LVM properly.
-  * Use LVM UUIDs whenever possible.
-  * GPT PReP.
-  * New `progress' module that shows progress information while reading
-    files.
-  * ZFS features support.
-  * ZFS LZ4 support.
-  * XFS V5 format support.
-  * LVM RAID1 support.
-
-* New/improved terminal and video support:
-  * Monochrome text (matching `hercules' in GRUB Legacy).
-  * Morse code output using system speaker.
-  * `spkmodem' output (simple data protocol using system speaker).
-  * Handle Japanese special keys.
-  * coreboot framebuffer.
-  * Serial on ARC.
-  * Native vt100 handling for grub-emu, replacing the use of the curses
-    library.
-  * New gfxmenu options for terminal window positioning, theme background
-    image handling, and scrollbar padding, plus `item_pixmap_style' and
-    `highlight_overlay'.
-  * Support several more image types (paletted and greyscale).
-
-* Boot protocol improvements:
-  * Support Apple FAT binaries on non-Apple platforms.
-  * Improve FreeDOS direct loading support compatibility.
-  * Enable `linux16' on all x86 platforms, not just BIOS.
-  * New TrueCrypt ISO loader.
-  * multiboot2 boot-services EFI specification.
-  * multiboot2 EFI memory map specification.
-  * multiboot2 full-file specfication.
-
-* New/improved network support:
-  * New variables `net_default_*' containing properties of the default
-    interface.
-  * Autoload `http' and `tftp' modules if necessary.
-  * Improve TFTP robustness.
-  * Parse `nd' disk names in GRUB Legacy configuration files.
-  * Issue separate DNS queries for IPv4 and IPv6.
-  * Support IPv6 Router Advertisement to configure default router.
-  * New variable net_<interface>_next_server containing next server
-    from BOOTP reply.
-
-* Coreboot improvements:
-  * CBFS support both in on-disk images (loopback) and flash.
-  * Ability to launch another payload from flash or disk
-  * Coreboot framebuffer
-  * CBMEMC support (both logging and inspecting logs)
-  * Command for inspecting coreboot timestamps (`coreboot_boottime').
-  * Command for inspecting coreboot tables (`lscoreboot').
-  * New target default_payload.elf.
-  * Increased maximal core size.
-  * Prefer pmtimer for TSC calibration.
-
-* New/improved platform support:
-  * New `efifwsetup' and `lsefi' commands on EFI platforms.
-  * New `cmosdump' and `cmosset' commands on platforms with CMOS support.
-  * New command `pcidump' for PCI platforms.
-  * Improve opcode parsing in ACPI halt implementation.
-  * Use the TSC as a possible time source on i386-ieee1275.
-  * Merge PowerPC grub-mkrescue implementation with the common one.
-  * Support grub-mkrescue on i386-ieee1275, sparc64, bootinfo machines such
-    as pSeries, and mips-arc.
-  * Make grub-mkrescue better support Apple Intel Macs on CD.
-  * Enable GRUB Legacy configuration file parsing on EFI.
-  * Support halt for Loongson 2E.
-  * ARM U-Boot and EFI ports.
-  * Reorganise platform-dependent code in utilities to avoid #ifdef mess.
-  * AROS and Haiku support for userspace utilities.
-  * Xen PV port.
-  * Fix EFI stack alignment.
-  * ARM64 EFI port.
-  * On Linux, read partition start offsets from sysfs if possible.
-  * New grub-macbless utility, and better integration with Mac firmware in
-    grub-install.
-  * Support Yeeloong 3A.
-  * Add `cpuid --pae' option to detect Physical Address Extension on x86.
-  * Support for USB debug dongles.
-  * Support for *-emu on all platforms (previously only i386/x86_64 worked).
-  * Support *-emu on Windows.
-  * New platform `none' which builds only user level utilities. This is now
-    default if target CPU is not supported.
-  * Support for booting little-endian Linux kernel on powerpc.
-  * Support network boot with Oracle sun4v vnet devices.
-  * Added SAS disks to the IEEE 1275 Open Firmware device list.
-  * Try multiple methods for TSC (timestamp counter) calibration - PIT, pmtimer,
-    EFI Stall. If everything fails, use hardcoded frequency 800MHz.
-  * Support Hyper-V Gen2 platforms which lack PIT for TSC calibration.
-  * Map UEFI Persistent Memory to E820 persistent memory.
-  * New Xen loader on ARM64.
-  * Respect alignment requirement for block device IO buffers on EFI.
-
-* Security:
-  * Add optional facility to enforce that all files read by the core image
-    from disk have a valid detached digital signature.
-
-* Performance:
-  * Avoid costly division operations in many places.
-  * New boot time analysis framework (`./configure --enable-boot-time').
-  * Initialise USB ports in parallel.
-  * New `testspeed' command to test file read speed.
-  * Speed-up gfxterm by storing intermediate results in more compact format.
-  * Lazy LVM/mdraid scan.
-  * Disk hints.
-
-* Scripting:
-  * New `eval' and `tr' commands.
-  * grub-script-check fails on scripts containing no commands.
-
-* Installation and other utility improvements:
-  * Add option to compress files on installation or image creation.
-  * Using grub-reboot no longer requires setting `GRUB_DEFAULT=saved'.
-  * Support probing EFI System Partition (requires os-prober >= 1.58).
-  * Fix inconsistent use of `GRUB_CRYPTODISK_ENABLE' and
-    `GRUB_ENABLE_CRYPTODISK'; the latter is now used consistently.
-  * grub-mount handles symbolic links to directories.
-  * Support disabling submenus with `GRUB_DISABLE_SUBMENU' configuration key
-    for grub-mkconfig.
-  * grub-install, grub-mknetdir, grub-mkrescue, and grub-mkstandalone
-    rewritten in C.  They should now work in supported non-Unix-like
-    environments.
-  * Native mingw support.
-  * Ability to install on EFI under windows.
-  * Reorganise timeout handling using new `timeout_style' environment
-    variable and `GRUB_TIMEOUT_STYLE' configuration key for grub-mkconfig.
-    Menu hotkeys pressed during a hidden timeout now boot the corresponding
-    menu entry immediately.
-  * New `file' command and grub-file utility to check file types.
-  * New syslinux configuration file parser.
-  * Set menu entry class to primary OS name returned by os-prober to display
-    OS specific icon.
-  * On Linux x86 detect EFI word size in grub-install and automatically select
-    correct platform (x86_64-efi or i386-efi) to install. Requires Linux kernel
-    4.0 or higher.
-
-* Build system:
-  * Remove all uses of nested functions; GRUB no longer requires an
-    executable stack.
-  * Fix documentation build with Texinfo >= 5.1.
-  * More robust and documented cross-compiling support.
-  * Partial clang support for some platforms (experimental).
-  * Partial mingw64 x86_64-efi compile support (highly experimental).
-  * Partial mingw32 i386-* (other than already present i386-pc)
-    compile support (highly experimental).
-  * Support for grub-mkpasswd on Windows.
-  * Eliminate the use of AutoGen.  This allowed some performance
-    improvements to the build system.
-  * Remove variable length arrays.
-  * OpenBSD compile and tools support (NetBSD and FreeBSD were already supported).
-  * Fix build with FreeType >= 2.5.1.
-  * Make gentpl.py compatible with Python 3.  It now requires at least
-    Python 2.6.
-  * modinfo.sh contains build information now.
-  * Added many new tests to improve robustness.
-  * Target is built without libgcc now. Necessary builtins are reimplemented
-    directly. This removes requirement for target-specific runtime on build
-    system.
-  * emu libusb support removed (was broken and unmaintained).
-  * powerpc64le compile support.
-  * Use fixed timestamp when generating GRUB image for reproducible builds.
-  * Verify at build time that modules contain only supported relocations and their
-    structure matches what boot-time module loader expects.
-  * Do not require fonts on powerpc-ieee1275.
-
-* Revision control moved to git.
-
 New in 2.00:

 * Appearance:
@@ -203,6 +24,7 @@ New in 2.00:
  * IEEE1275 serial.
  * EFI serial.
  * Network stack for BIOS, IEEE1275, EMU and EFI, including TFTP, HTTP and DNS.
+  * VBE on coreboot support.

 * New filesystem, filters and disks formats:
  * DVH partition map.
@@ -226,7 +48,7 @@ New in 2.00:
  * multidevice, mirrored and raidz(2,3) ZFS support.
  * RAID LVM (internal RAIDing) support.
  * ZFS crypto support.
-  * ZLE, LZ4 and GZIP on ZFS support.
+  * ZLE and GZIP on ZFS support.
  * Support ZFS up to 33.
  * HFS string is now treated like mac-roman and not UTF-8
  * HFS mtime support.
--- a/2
+++ b/2
@@ -12,6 +12,8 @@ The URL is <http://www.gnu.org/software/grub/grub.html>.

 More extensive documentation is available in the Info manual,
 accessible using 'info grub' after building and installing GRUB 2.
+Please look at the GRUB Wiki <http://grub.enbug.org> for testing
+procedures.

 There are a number of important user-visible differences from the
 first version of GRUB, now known as GRUB Legacy. For a summary, please
--- a/4
+++ b/4
@@ -7,3 +7,7 @@ glance. So write to <grub-devel@gnu.org> first.
 For bug tracking, refer to:

  http://savannah.gnu.org/bugs/?group=grub
+
+Our wiki also lists some areas that need work:
+
+  http://grub.enbug.org/
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -19,8 +19,6 @@ AC_DEFUN([grub_PROG_TARGET_CC],
 AC_CACHE_VAL(grub_cv_prog_target_cc,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
 int main (void);
 ]], [[]])],
  		[grub_cv_prog_target_cc=yes],
@@ -93,7 +91,7 @@ else
 fi
 grub_cv_prog_objcopy_absolute=yes
 for link_addr in 0x2000 0x8000 0x7C00; do
-  if AC_TRY_COMMAND([${CC-cc} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC} ${TARGET_IMG_BASE_LDOPT},$link_addr conftest.o -o conftest.exec]); then :
+  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC} ${TARGET_IMG_BASE_LDOPT},$link_addr conftest.o -o conftest.exec]); then :
  else
    AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr])
  fi
@@ -136,29 +134,6 @@ if test "x$grub_cv_prog_ld_build_id_none" = xyes; then
 fi
 ])

-dnl Check nm
-AC_DEFUN([grub_PROG_NM_WORKS],
-[AC_MSG_CHECKING([whether nm works])
-AC_CACHE_VAL(grub_cv_prog_nm_works,
-[
-nm_works_tmp_dir="$(mktemp -d "./confXXXXXX")"
-AC_LANG_CONFTEST([AC_LANG_PROGRAM([[]], [[]])])
-$TARGET_CC $TARGET_CFLAGS -c conftest.c -o "$nm_works_tmp_dir/ef"
-if $TARGET_NM "$nm_works_tmp_dir/ef" > /dev/null; then
-   grub_cv_prog_nm_works=yes
-else
-   grub_cv_prog_nm_minus_p=no
-fi
-rm "$nm_works_tmp_dir/ef"
-rmdir "$nm_works_tmp_dir"
-])
-AC_MSG_RESULT([$grub_cv_prog_nm_works])
-
-if test "x$grub_cv_prog_nm_works" != xyes; then
-  AC_MSG_ERROR([nm does not work])
-fi
-])
-
 dnl Supply -P to nm
 AC_DEFUN([grub_PROG_NM_MINUS_P],
 [AC_MSG_CHECKING([whether nm accepts -P])
@@ -166,14 +141,13 @@ AC_CACHE_VAL(grub_cv_prog_nm_minus_p,
 [
 nm_minus_p_tmp_dir="$(mktemp -d "./confXXXXXX")"
 AC_LANG_CONFTEST([AC_LANG_PROGRAM([[]], [[]])])
-$TARGET_CC $TARGET_CFLAGS -c conftest.c -o "$nm_minus_p_tmp_dir/ef"
+$TARGET_CC conftest.c -o "$nm_minus_p_tmp_dir/ef"
 if $TARGET_NM -P "$nm_minus_p_tmp_dir/ef" 2>&1 > /dev/null; then
   grub_cv_prog_nm_minus_p=yes
 else
   grub_cv_prog_nm_minus_p=no
 fi
 rm "$nm_minus_p_tmp_dir/ef"
-rmdir "$nm_minus_p_tmp_dir"
 ])
 AC_MSG_RESULT([$grub_cv_prog_nm_minus_p])

@@ -191,14 +165,13 @@ AC_CACHE_VAL(grub_cv_prog_nm_defined_only,
 [
 nm_defined_only_tmp_dir="$(mktemp -d "./confXXXXXX")"
 AC_LANG_CONFTEST([AC_LANG_PROGRAM([[]], [[]])])
-$TARGET_CC $TARGET_CFLAGS -c conftest.c -o "$nm_defined_only_tmp_dir/ef"
+$TARGET_CC conftest.c -o "$nm_defined_only_tmp_dir/ef"
 if $TARGET_NM --defined-only "$nm_defined_only_tmp_dir/ef" 2>&1 > /dev/null; then
   grub_cv_prog_nm_defined_only=yes
 else
   grub_cv_prog_nm_defined_only=no
 fi
 rm "$nm_defined_only_tmp_dir/ef"
-rmdir "$nm_defined_only_tmp_dir"
 ])
 AC_MSG_RESULT([$grub_cv_prog_nm_defined_only])

@@ -210,18 +183,118 @@ fi
 ])


+dnl Mass confusion!
+dnl Older versions of GAS interpret `.code16' to mean ``generate 32-bit
+dnl instructions, but implicitly insert addr32 and data32 bytes so
+dnl that the code works in real mode''.
+dnl
+dnl Newer versions of GAS interpret `.code16' to mean ``generate 16-bit
+dnl instructions,'' which seems right.  This requires the programmer
+dnl to explicitly insert addr32 and data32 instructions when they want
+dnl them.
+dnl
+dnl We only support the newer versions, because the old versions cause
+dnl major pain, by requiring manual assembly to get 16-bit instructions into
+dnl asm files.
+AC_DEFUN([grub_I386_ASM_ADDR32],
+[AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([grub_I386_ASM_PREFIX_REQUIREMENT])
+AC_MSG_CHECKING([for .code16 addr32 assembler support])
+AC_CACHE_VAL(grub_cv_i386_asm_addr32,
+[cat > conftest.s.in <<\EOF
+	.code16
+l1:	@ADDR32@	movb	%al, l1
+EOF
+
+if test "x$grub_cv_i386_asm_prefix_requirement" = xyes; then
+  sed -e s/@ADDR32@/addr32/ < conftest.s.in > conftest.s
+else
+  sed -e s/@ADDR32@/addr32\;/ < conftest.s.in > conftest.s
+fi
+
+if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -c conftest.s]) && test -s conftest.o; then
+  grub_cv_i386_asm_addr32=yes
+else
+  grub_cv_i386_asm_addr32=no
+fi
+
+rm -f conftest*])
+
+AC_MSG_RESULT([$grub_cv_i386_asm_addr32])])
+
+dnl check if our compiler is apple cc
+dnl because it requires numerous workarounds
+AC_DEFUN([grub_apple_cc],
+[AC_REQUIRE([AC_PROG_CC])
+AC_MSG_CHECKING([whether our compiler is apple cc])
+AC_CACHE_VAL(grub_cv_apple_cc,
+[if $CC -v 2>&1 | grep "Apple Inc." > /dev/null; then
+  grub_cv_apple_cc=yes
+else
+  grub_cv_apple_cc=no
+fi
+])
+
+AC_MSG_RESULT([$grub_cv_apple_cc])])
+
+dnl check if our target compiler is apple cc
+dnl because it requires numerous workarounds
+AC_DEFUN([grub_apple_target_cc],
+[AC_REQUIRE([AC_PROG_CC])
+AC_MSG_CHECKING([whether our target compiler is apple cc])
+AC_CACHE_VAL(grub_cv_apple_target_cc,
+[if $CC -v 2>&1 | grep "Apple Inc." > /dev/null; then
+  grub_cv_apple_target_cc=yes
+else
+  grub_cv_apple_target_cc=no
+fi
+])
+
+AC_MSG_RESULT([$grub_cv_apple_target_cc])])
+
+
+dnl Later versions of GAS requires that addr32 and data32 prefixes
+dnl appear in the same lines as the instructions they modify, while
+dnl earlier versions requires that they appear in separate lines.
+AC_DEFUN([grub_I386_ASM_PREFIX_REQUIREMENT],
+[AC_REQUIRE([AC_PROG_CC])
+AC_MSG_CHECKING(dnl
+[whether addr32 must be in the same line as the instruction])
+AC_CACHE_VAL(grub_cv_i386_asm_prefix_requirement,
+[cat > conftest.s <<\EOF
+	.code16
+l1:	addr32	movb	%al, l1
+EOF
+
+if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -c conftest.s]) && test -s conftest.o; then
+  grub_cv_i386_asm_prefix_requirement=yes
+else
+  grub_cv_i386_asm_prefix_requirement=no
+fi
+
+rm -f conftest*])
+
+if test "x$grub_cv_i386_asm_prefix_requirement" = xyes; then
+  grub_tmp_addr32="addr32"
+  grub_tmp_data32="data32"
+else
+  grub_tmp_addr32="addr32;"
+  grub_tmp_data32="data32;"
+fi
+
+ADDR32=$grub_tmp_addr32
+DATA32=$grub_tmp_data32
+
+AC_MSG_RESULT([$grub_cv_i386_asm_prefix_requirement])])
+
+
 dnl Check what symbol is defined as a bss start symbol.
 dnl Written by Michael Hohmoth and Yoshinori K. Okuji.
 AC_DEFUN([grub_CHECK_BSS_START_SYMBOL],
 [AC_REQUIRE([AC_PROG_CC])
 AC_MSG_CHECKING([if __bss_start is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_uscore_uscore_bss_start_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);
-]],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
 		[[asm ("incl __bss_start")]])],
 		[grub_cv_check_uscore_uscore_bss_start_symbol=yes],
 		[grub_cv_check_uscore_uscore_bss_start_symbol=no])])
@@ -230,11 +303,7 @@ AC_MSG_RESULT([$grub_cv_check_uscore_uscore_bss_start_symbol])

 AC_MSG_CHECKING([if edata is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_edata_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);]],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
 		[[asm ("incl edata")]])],
 		[grub_cv_check_edata_symbol=yes],
 		[grub_cv_check_edata_symbol=no])])
@@ -243,11 +312,7 @@ AC_MSG_RESULT([$grub_cv_check_edata_symbol])

 AC_MSG_CHECKING([if _edata is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_uscore_edata_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);]],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
 		[[asm ("incl _edata")]])],
 		[grub_cv_check_uscore_edata_symbol=yes],
 		[grub_cv_check_uscore_edata_symbol=no])])
@@ -271,11 +336,7 @@ AC_DEFUN([grub_CHECK_END_SYMBOL],
 [AC_REQUIRE([AC_PROG_CC])
 AC_MSG_CHECKING([if end is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_end_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);]],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
 		[[asm ("incl end")]])],
 		[grub_cv_check_end_symbol=yes],
 		[grub_cv_check_end_symbol=no])])
@@ -284,11 +345,7 @@ AC_MSG_RESULT([$grub_cv_check_end_symbol])

 AC_MSG_CHECKING([if _end is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_uscore_end_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);]],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
 		[[asm ("incl _end")]])],
 		[grub_cv_check_uscore_end_symbol=yes],
 		[grub_cv_check_uscore_end_symbol=no])])
@@ -334,7 +391,7 @@ AC_MSG_CHECKING([whether `$CC' accepts `-mstack-arg-probe'])
 AC_LANG_CONFTEST([AC_LANG_SOURCE([[
 void foo (void) { volatile char a[8]; a[3]; }
 ]])])
-[if eval "$ac_compile -S -mstack-arg-probe -Werror -o conftest.s" 2> /dev/null; then]
+[if eval "$ac_compile -S -mstack-arg-probe -o conftest.s" 2> /dev/null; then]
  AC_MSG_RESULT([yes])
  [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'?
  rm -f conftest.s
@@ -344,15 +401,15 @@ else
 [fi]
 ])

-dnl Check if ln -s can handle directories properly (mingw).
+dnl Check if ln can handle directories properly (mingw).
 AC_DEFUN([grub_CHECK_LINK_DIR],[
-AC_MSG_CHECKING([whether ln -s can handle directories properly])
+AC_MSG_CHECKING([whether ln can handle directories properly])
 [mkdir testdir 2>/dev/null
 case $srcdir in
 [\\/$]* | ?:[\\/]* ) reldir=$srcdir/include/grub/util ;;
    *) reldir=../$srcdir/include/grub/util ;;
 esac
-if ln -s $reldir testdir/util 2>/dev/null && rm -f testdir/util 2>/dev/null ; then]
+if ln -s $reldir testdir/util 2>/dev/null ; then]
  AC_MSG_RESULT([yes])
  [link_dir=yes
 else
@@ -390,58 +447,6 @@ else
 [fi]
 ])

-AC_DEFUN([grub_CHECK_LINK_PIE],[
-[# Position independent executable.
-link_nopie_needed=no]
-AC_MSG_CHECKING([whether linker needs disabling of PIE to work])
-AC_LANG_CONFTEST([AC_LANG_SOURCE([[]])])
-
-[if eval "$ac_compile -Wl,-r,-d -nostdlib -Werror -o conftest.o" 2> /dev/null; then]
-  AC_MSG_RESULT([no])
-  [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'?
-  rm -f conftest.o
-else
-  link_nopie_needed=yes]
-  AC_MSG_RESULT([yes])
-[fi]
-])
-
-
-dnl Check if the Linker supports `-no-pie'.
-AC_DEFUN([grub_CHECK_NO_PIE],
-[AC_MSG_CHECKING([whether linker accepts -no-pie])
-AC_CACHE_VAL(grub_cv_cc_ld_no_pie,
-[save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -no-pie -nostdlib -Werror"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-	       [grub_cv_cc_ld_no_pie=yes],
-	       [grub_cv_cc_ld_no_pie=no])
-LDFLAGS="$save_LDFLAGS"
-])
-AC_MSG_RESULT([$grub_cv_cc_ld_no_pie])
-nopie_possible=no
-if test "x$grub_cv_cc_ld_no_pie" = xyes ; then
-  nopie_possible=yes
-fi
-])
-
-AC_DEFUN([grub_CHECK_NO_PIE_ONEWORD],
-[AC_MSG_CHECKING([whether linker accepts -nopie])
-AC_CACHE_VAL(grub_cv_cc_ld_no_pie_oneword,
-[save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -nopie -nostdlib -Werror"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-	       [grub_cv_cc_ld_no_pie_oneword=yes],
-	       [grub_cv_cc_ld_no_pie_oneword=no])
-LDFLAGS="$save_LDFLAGS"
-])
-AC_MSG_RESULT([$grub_cv_cc_ld_no_pie_oneword])
-nopie_oneword_possible=no
-if test "x$grub_cv_cc_ld_no_pie_oneword" = xyes ; then
-  nopie_oneword_possible=yes
-fi
-])
-
 dnl Check if the C compiler supports `-fPIC'.
 AC_DEFUN([grub_CHECK_PIC],[
 [# Position independent executable.
@@ -475,3 +480,23 @@ dnl program.
 AC_DEFUN([grub_TRANSFORM],[dnl
 AC_SUBST(AS_TR_SH([$1]), [`AS_ECHO([$1]) | sed "$program_transform_name"`])dnl
 ])
+
+dnl Check if the C compiler supports `-mno-unaligned-access'.
+AC_DEFUN([grub_CHECK_NO_UNALIGNED_ACCESS],[
+[# foobar
+nua_possible=yes]
+AC_MSG_CHECKING([whether `$CC' supports `-mno-unaligned-access'])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[
+int main() {
+	return 0;
+}
+]])])
+
+[if eval "$ac_compile -S -mno-unaligned-access -o conftest.s" 2> /dev/null; then]
+  AC_MSG_RESULT([yes])
+  [rm -f conftest.s
+else
+  nua_possible=no]
+  AC_MSG_RESULT([no])
+[fi]
+])
--- a/asm-tests/arm.S
+++ b/asm-tests/arm.S
@@ -1,20 +0,0 @@
-/* on arm clang doesn't support .arch directive */
-
-	.text
-	.syntax	unified
-
-#if !defined (__thumb2__)
-	.arch	armv7a
-	.arm
-#else
-	.arch	armv7
-	.thumb
-#endif
-	mcr	p15, 0, r11, c7, c14, 2
-
-	/* clang restricts access to dsb/isb despite .arch  */
-	dsb
-	isb
-
-
-	
--- a/asm-tests/i386-pc.S
+++ b/asm-tests/i386-pc.S
@@ -1,18 +0,0 @@
-/* on x86 old clang doesn't support .code16
-   newer clang supports it but creates 6-byte jumps instead of 3-byte ones
-   which makes us go over boot sector size.
-   Starting with 3.9 clang emits 3-byte jumps but still creates 8-bytes movl
-   instead of 5-bytes, so code overflows into data.  */
-
-	.code16
-	jmp far
-	.org 4
-	jmp nearer
-	.org 6
-	movl nearer, %ebx
-	.org 11
-	.space 100
-nearer:
-	.space 200
-far:
-	.byte 0
--- a/asm-tests/i386.S
+++ b/asm-tests/i386.S
@@ -1,4 +0,0 @@
-/* on x86 old clang doesn't support .code16  */
-
-	.code16
-	movb %al, %bl
--- a/asm-tests/mips.S
+++ b/asm-tests/mips.S
@@ -1,11 +0,0 @@
-/* on mips clang doesn't support privilegied instructions, doubleword store/load
-   and crashes with hand-written assembly
- */
-
-	.set mips3
-	sync
-	ld $t2, 0($t1)
-
-a:
-	addiu $t1, $s0, (b - a)
-b:	nop
--- a/asm-tests/powerpc.S
+++ b/asm-tests/powerpc.S
@@ -1,8 +0,0 @@
-/* clang <= 3.3 doesn't handle most of ppc assembly, not even inline assembly
-   used by gcrypt */
-/* Cache invalidation loop is a fair test.  */
-	li 5, 0
-1:	icbi 5, 3
-	addi 5, 5, 32
-	cmpw 5, 4
-	blt 1b
--- a/asm-tests/sparc64.S
+++ b/asm-tests/sparc64.S
@@ -1,9 +0,0 @@
-        .text
-1:	
-	/* A small list of examples of what clang doesn't support.  */
-	clr	%o0
-	lduw	[%o4 + 4], %o4
-	and     %o6, ~0xff, %o6
-	stw	%o5, [%o3]
-	bne,pt	%icc, 1b
-	 nop
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,20 +2,19 @@

 set -e

-# Set ${PYTHON} to plain 'python' if not set already
-: ${PYTHON:=python}
-
 export LC_COLLATE=C
 unset LC_ALL

-find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c'  ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' |sort > po/POTFILES.in
+find . -iname '*.[ch]' ! -ipath '*/grub-core/braille/brltty/*' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c'  ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' |sort > po/POTFILES.in
 find util -iname '*.in' ! -name Makefile.in  |sort > po/POTFILES-shell.in

+autogen --version >/dev/null || exit 1
+
 echo "Importing unicode..."
-${PYTHON} util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt grub-core/unidata.c
+python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt grub-core/unidata.c

 echo "Importing libgcrypt..."
-${PYTHON} util/import_gcry.py grub-core/lib/libgcrypt/ grub-core
+python util/import_gcry.py grub-core/lib/libgcrypt/ grub-core
 sed -n -f util/import_gcrypth.sed < grub-core/lib/libgcrypt/src/gcrypt.h.in > include/grub/gcrypt/gcrypt.h
 if [ -f include/grub/gcrypt/g10lib.h ]; then
    rm include/grub/gcrypt/g10lib.h
@@ -23,17 +22,20 @@ fi
 if [ -d grub-core/lib/libgcrypt-grub/mpi/generic ]; then 
    rm -rf grub-core/lib/libgcrypt-grub/mpi/generic
 fi
-cp grub-core/lib/libgcrypt-grub/src/g10lib.h include/grub/gcrypt/g10lib.h
+ln -s ../../../grub-core/lib/libgcrypt-grub/src/g10lib.h include/grub/gcrypt/g10lib.h
 cp -R grub-core/lib/libgcrypt/mpi/generic grub-core/lib/libgcrypt-grub/mpi/generic

 for x in mpi-asm-defs.h mpih-add1.c mpih-sub1.c mpih-mul1.c mpih-mul2.c mpih-mul3.c mpih-lshift.c mpih-rshift.c; do
    if [ -h grub-core/lib/libgcrypt-grub/mpi/"$x" ] || [ -f grub-core/lib/libgcrypt-grub/mpi/"$x" ]; then
 	rm grub-core/lib/libgcrypt-grub/mpi/"$x"
    fi
-    cp grub-core/lib/libgcrypt-grub/mpi/generic/"$x" grub-core/lib/libgcrypt-grub/mpi/"$x"
+    ln -s generic/"$x" grub-core/lib/libgcrypt-grub/mpi/"$x"
 done

-echo "Generating Automake input..."
+echo "Creating Makefile.tpl..."
+python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
+
+echo "Running autogen..."

 # Automake doesn't like including files from a path outside the project.
 rm -f contrib grub-core/contrib
@@ -57,8 +59,8 @@ for extra in contrib/*/Makefile.core.def; do
  fi
 done

-${PYTHON} gentpl.py $UTIL_DEFS > Makefile.util.am
-${PYTHON} gentpl.py $CORE_DEFS > grub-core/Makefile.core.am
+cat $UTIL_DEFS | autogen -T Makefile.tpl | sed -e '/^$/{N;/^\n$/D;}' > Makefile.util.am
+cat $CORE_DEFS | autogen -T Makefile.tpl | sed -e '/^$/{N;/^\n$/D;}' > grub-core/Makefile.core.am

 for extra in contrib/*/Makefile.common; do
  if test -e "$extra"; then
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -1,432 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
-  & eval 'exec perl -wS "$0" $argv:q'
-    if 0;
-# Convert git log output to ChangeLog format.
-
-my $VERSION = '2012-07-29 06:11'; # UTC
-# The definition above must lie within the first 8 lines in order
-# for the Emacs time-stamp write hook (at end) to update it.
-# If you change this file with Emacs, please let the write hook
-# do its job.  Otherwise, update this string manually.
-
-# Copyright (C) 2008-2014 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 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, see <http://www.gnu.org/licenses/>.
-
-# Written by Jim Meyering
-
-use strict;
-use warnings;
-use Getopt::Long;
-use POSIX qw(strftime);
-
-(my $ME = $0) =~ s|.*/||;
-
-# use File::Coda; # http://meyering.net/code/Coda/
-END {
-  defined fileno STDOUT or return;
-  close STDOUT and return;
-  warn "$ME: failed to close standard output: $!\n";
-  $? ||= 1;
-}
-
-sub usage ($)
-{
-  my ($exit_code) = @_;
-  my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
-  if ($exit_code != 0)
-    {
-      print $STREAM "Try '$ME --help' for more information.\n";
-    }
-  else
-    {
-      print $STREAM <<EOF;
-Usage: $ME [OPTIONS] [ARGS]
-
-Convert git log output to ChangeLog format.  If present, any ARGS
-are passed to "git log".  To avoid ARGS being parsed as options to
-$ME, they may be preceded by '--'.
-
-OPTIONS:
-
-   --amend=FILE FILE maps from an SHA1 to perl code (i.e., s/old/new/) that
-                  makes a change to SHA1's commit log text or metadata.
-   --append-dot append a dot to the first line of each commit message if
-                  there is no other punctuation or blank at the end.
-   --no-cluster never cluster commit messages under the same date/author
-                  header; the default is to cluster adjacent commit messages
-                  if their headers are the same and neither commit message
-                  contains multiple paragraphs.
-   --srcdir=DIR the root of the source tree, from which the .git/
-                  directory can be derived.
-   --since=DATE convert only the logs since DATE;
-                  the default is to convert all log entries.
-   --format=FMT set format string for commit subject and body;
-                  see 'man git-log' for the list of format metacharacters;
-                  the default is '%s%n%b%n'
-   --strip-tab  remove one additional leading TAB from commit message lines.
-   --strip-cherry-pick  remove data inserted by "git cherry-pick";
-                  this includes the "cherry picked from commit ..." line,
-                  and the possible final "Conflicts:" paragraph.
-   --help       display this help and exit
-   --version    output version information and exit
-
-EXAMPLE:
-
-  $ME --since=2008-01-01 > ChangeLog
-  $ME -- -n 5 foo > last-5-commits-to-branch-foo
-
-SPECIAL SYNTAX:
-
-The following types of strings are interpreted specially when they appear
-at the beginning of a log message line.  They are not copied to the output.
-
-  Copyright-paperwork-exempt: Yes
-    Append the "(tiny change)" notation to the usual "date name email"
-    ChangeLog header to mark a change that does not require a copyright
-    assignment.
-  Co-authored-by: Joe User <user\@example.com>
-    List the specified name and email address on a second
-    ChangeLog header, denoting a co-author.
-  Signed-off-by: Joe User <user\@example.com>
-    These lines are simply elided.
-
-In a FILE specified via --amend, comment lines (starting with "#") are ignored.
-FILE must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1 (alone on
-a line) referring to a commit in the current project, and CODE refers to one
-or more consecutive lines of Perl code.  Pairs must be separated by one or
-more blank line.
-
-Here is sample input for use with --amend=FILE, from coreutils:
-
-3a169f4c5d9159283548178668d2fae6fced3030
-# fix typo in title:
-s/all tile types/all file types/
-
-1379ed974f1fa39b12e2ffab18b3f7a607082202
-# Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself.
-# Change the author to be Paul.  Note the escaped "@":
-s,Jim .*>,Paul Eggert <eggert\\\@cs.ucla.edu>,
-
-EOF
-    }
-  exit $exit_code;
-}
-
-# If the string $S is a well-behaved file name, simply return it.
-# If it contains white space, quotes, etc., quote it, and return the new string.
-sub shell_quote($)
-{
-  my ($s) = @_;
-  if ($s =~ m![^\w+/.,-]!)
-    {
-      # Convert each single quote to '\''
-      $s =~ s/\'/\'\\\'\'/g;
-      # Then single quote the string.
-      $s = "'$s'";
-    }
-  return $s;
-}
-
-sub quoted_cmd(@)
-{
-  return join (' ', map {shell_quote $_} @_);
-}
-
-# Parse file F.
-# Comment lines (starting with "#") are ignored.
-# F must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1
-# (alone on a line) referring to a commit in the current project, and
-# CODE refers to one or more consecutive lines of Perl code.
-# Pairs must be separated by one or more blank line.
-sub parse_amend_file($)
-{
-  my ($f) = @_;
-
-  open F, '<', $f
-    or die "$ME: $f: failed to open for reading: $!\n";
-
-  my $fail;
-  my $h = {};
-  my $in_code = 0;
-  my $sha;
-  while (defined (my $line = <F>))
-    {
-      $line =~ /^\#/
-        and next;
-      chomp $line;
-      $line eq ''
-        and $in_code = 0, next;
-
-      if (!$in_code)
-        {
-          $line =~ /^([0-9a-fA-F]{40})$/
-            or (warn "$ME: $f:$.: invalid line; expected an SHA1\n"),
-              $fail = 1, next;
-          $sha = lc $1;
-          $in_code = 1;
-          exists $h->{$sha}
-            and (warn "$ME: $f:$.: duplicate SHA1\n"),
-              $fail = 1, next;
-        }
-      else
-        {
-          $h->{$sha} ||= '';
-          $h->{$sha} .= "$line\n";
-        }
-    }
-  close F;
-
-  $fail
-    and exit 1;
-
-  return $h;
-}
-
-# git_dir_option $SRCDIR
-#
-# From $SRCDIR, the --git-dir option to pass to git (none if $SRCDIR
-# is undef).  Return as a list (0 or 1 element).
-sub git_dir_option($)
-{
-  my ($srcdir) = @_;
-  my @res = ();
-  if (defined $srcdir)
-    {
-      my $qdir = shell_quote $srcdir;
-      my $cmd = "cd $qdir && git rev-parse --show-toplevel";
-      my $qcmd = shell_quote $cmd;
-      my $git_dir = qx($cmd);
-      defined $git_dir
-        or die "$ME: cannot run $qcmd: $!\n";
-      $? == 0
-        or die "$ME: $qcmd had unexpected exit code or signal ($?)\n";
-      chomp $git_dir;
-      push @res, "--git-dir=$git_dir/.git";
-    }
-  @res;
-}
-
-{
-  my $since_date;
-  my $format_string = '%s%n%b%n';
-  my $amend_file;
-  my $append_dot = 0;
-  my $cluster = 1;
-  my $strip_tab = 0;
-  my $strip_cherry_pick = 0;
-  my $srcdir;
-  GetOptions
-    (
-     help => sub { usage 0 },
-     version => sub { print "$ME version $VERSION\n"; exit },
-     'since=s' => \$since_date,
-     'format=s' => \$format_string,
-     'amend=s' => \$amend_file,
-     'append-dot' => \$append_dot,
-     'cluster!' => \$cluster,
-     'strip-tab' => \$strip_tab,
-     'strip-cherry-pick' => \$strip_cherry_pick,
-     'srcdir=s' => \$srcdir,
-    ) or usage 1;
-
-  defined $since_date
-    and unshift @ARGV, "--since=$since_date";
-
-  # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/)
-  # that makes a correction in the log or attribution of that commit.
-  my $amend_code = defined $amend_file ? parse_amend_file $amend_file : {};
-
-  my @cmd = ('git',
-             git_dir_option $srcdir,
-             qw(log --log-size),
-             '--pretty=format:%H:%ct  %an  <%ae>%n%n'.$format_string, @ARGV);
-  open PIPE, '-|', @cmd
-    or die ("$ME: failed to run '". quoted_cmd (@cmd) ."': $!\n"
-            . "(Is your Git too old?  Version 1.5.1 or later is required.)\n");
-
-  my $prev_multi_paragraph;
-  my $prev_date_line = '';
-  my @prev_coauthors = ();
-  while (1)
-    {
-      defined (my $in = <PIPE>)
-        or last;
-      $in =~ /^log size (\d+)$/
-        or die "$ME:$.: Invalid line (expected log size):\n$in";
-      my $log_nbytes = $1;
-
-      my $log;
-      my $n_read = read PIPE, $log, $log_nbytes;
-      $n_read == $log_nbytes
-        or die "$ME:$.: unexpected EOF\n";
-
-      # Extract leading hash.
-      my ($sha, $rest) = split ':', $log, 2;
-      defined $sha
-        or die "$ME:$.: malformed log entry\n";
-      $sha =~ /^[0-9a-fA-F]{40}$/
-        or die "$ME:$.: invalid SHA1: $sha\n";
-
-      # If this commit's log requires any transformation, do it now.
-      my $code = $amend_code->{$sha};
-      if (defined $code)
-        {
-          eval 'use Safe';
-          my $s = new Safe;
-          # Put the unpreprocessed entry into "$_".
-          $_ = $rest;
-
-          # Let $code operate on it, safely.
-          my $r = $s->reval("$code")
-            or die "$ME:$.:$sha: failed to eval \"$code\":\n$@\n";
-
-          # Note that we've used this entry.
-          delete $amend_code->{$sha};
-
-          # Update $rest upon success.
-          $rest = $_;
-        }
-
-      # Remove lines inserted by "git cherry-pick".
-      if ($strip_cherry_pick)
-        {
-          $rest =~ s/^\s*Conflicts:\n.*//sm;
-          $rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m;
-        }
-
-      my @line = split "\n", $rest;
-      my $author_line = shift @line;
-      defined $author_line
-        or die "$ME:$.: unexpected EOF\n";
-      $author_line =~ /^(\d+)  (.*>)$/
-        or die "$ME:$.: Invalid line "
-          . "(expected date/author/email):\n$author_line\n";
-
-      # Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog
-      # `(tiny change)' annotation.
-      my $tiny = (grep (/^Copyright-paperwork-exempt:\s+[Yy]es$/, @line)
-                  ? '  (tiny change)' : '');
-
-      my $date_line = sprintf "%s  %s$tiny\n",
-        strftime ("%F", localtime ($1)), $2;
-
-      my @coauthors = grep /^Co-authored-by:.*$/, @line;
-      # Omit meta-data lines we've already interpreted.
-      @line = grep !/^(?:Signed-off-by:[ ].*>$
-                       |Co-authored-by:[ ]
-                       |Copyright-paperwork-exempt:[ ]
-                       )/x, @line;
-
-      # Remove leading and trailing blank lines.
-      if (@line)
-        {
-          while ($line[0] =~ /^\s*$/) { shift @line; }
-          while ($line[$#line] =~ /^\s*$/) { pop @line; }
-        }
-
-      # Record whether there are two or more paragraphs.
-      my $multi_paragraph = grep /^\s*$/, @line;
-
-      # Format 'Co-authored-by: A U Thor <email@example.com>' lines in
-      # standard multi-author ChangeLog format.
-      for (@coauthors)
-        {
-          s/^Co-authored-by:\s*/\t    /;
-          s/\s*</  </;
-
-          /<.*?@.*\..*>/
-            or warn "$ME: warning: missing email address for "
-              . substr ($_, 5) . "\n";
-        }
-
-      # If clustering of commit messages has been disabled, if this header
-      # would be different from the previous date/name/email/coauthors header,
-      # or if this or the previous entry consists of two or more paragraphs,
-      # then print the header.
-      if ( ! $cluster
-          || $date_line ne $prev_date_line
-          || "@coauthors" ne "@prev_coauthors"
-          || $multi_paragraph
-          || $prev_multi_paragraph)
-        {
-          $prev_date_line eq ''
-            or print "\n";
-          print $date_line;
-          @coauthors
-            and print join ("\n", @coauthors), "\n";
-        }
-      $prev_date_line = $date_line;
-      @prev_coauthors = @coauthors;
-      $prev_multi_paragraph = $multi_paragraph;
-
-      # If there were any lines
-      if (@line == 0)
-        {
-          warn "$ME: warning: empty commit message:\n  $date_line\n";
-        }
-      else
-        {
-          if ($append_dot)
-            {
-              # If the first line of the message has enough room, then
-              if (length $line[0] < 72)
-                {
-                  # append a dot if there is no other punctuation or blank
-                  # at the end.
-                  $line[0] =~ /[[:punct:]\s]$/
-                    or $line[0] .= '.';
-                }
-            }
-
-          # Remove one additional leading TAB from each line.
-          $strip_tab
-            and map { s/^\t// } @line;
-
-          # Prefix each non-empty line with a TAB.
-          @line = map { length $_ ? "\t$_" : '' } @line;
-
-          print "\n", join ("\n", @line), "\n";
-        }
-
-      defined ($in = <PIPE>)
-        or last;
-      $in ne "\n"
-        and die "$ME:$.: unexpected line:\n$in";
-    }
-
-  close PIPE
-    or die "$ME: error closing pipe from " . quoted_cmd (@cmd) . "\n";
-  # FIXME-someday: include $PROCESS_STATUS in the diagnostic
-
-  # Complain about any unused entry in the --amend=F specified file.
-  my $fail = 0;
-  foreach my $sha (keys %$amend_code)
-    {
-      warn "$ME:$amend_file: unused entry: $sha\n";
-      $fail = 1;
-    }
-
-  exit $fail;
-}
-
-# Local Variables:
-# mode: perl
-# indent-tabs-mode: nil
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "my $VERSION = '"
-# time-stamp-format: "%:y-%02m-%02d %02H:%02M"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "'; # UTC"
-# End:
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -6,23 +6,42 @@ export LC_COLLATE := C
 unexport LC_ALL

 # Platform specific options
+if COND_i386_pc
+  CFLAGS_PLATFORM += -mrtd -mregparm=3 -freg-struct-return
+endif
+if COND_i386_qemu
+  CFLAGS_PLATFORM += -mrtd -mregparm=3 -freg-struct-return
+endif
+if COND_i386_coreboot
+  CFLAGS_PLATFORM += -mrtd -mregparm=3 -freg-struct-return
+endif
+if COND_i386_ieee1275
+  CFLAGS_PLATFORM += -mrtd -mregparm=3 -freg-struct-return
+endif
+if COND_mips_loongson
+  CFLAGS_PLATFORM += -mexplicit-relocs
+  CPPFLAGS_PLATFORM = -DUSE_ASCII_FALLBACK
+endif
+if COND_mips
+  CFLAGS_PLATFORM += -mflush-func=grub_red_herring
+  CCASFLAGS_PLATFORM = -march=mips3
+endif
 if COND_sparc64_ieee1275
-  LDFLAGS_PLATFORM = -Wl,-melf64_sparc
+  CFLAGS_PLATFORM += -mno-app-regs
+  LDFLAGS_PLATFORM = -Wl,-melf64_sparc -mno-relax
 endif
 if COND_arm
-if !COND_emu
+  CFLAGS_PLATFORM += -mthumb-interwork -mlong-calls
  LDFLAGS_PLATFORM = -Wl,--wrap=__clear_cache
 endif
-endif
-if COND_arm64
-  CFLAGS_PLATFORM += -mcmodel=large
-endif
-if COND_powerpc_ieee1275
-  CFLAGS_PLATFORM += -mcpu=powerpc
-endif

 # Other options

+if ! COND_emu
+CFLAGS_PLATFORM += -Dfloat=__grub_poison
+CFLAGS_PLATFORM += -Ddouble=__grub_poison
+endif
+
 CPPFLAGS_DEFAULT = -DGRUB_FILE=\"$(subst $(srcdir)/,,$<)\"
 CPPFLAGS_DEFAULT += -I$(builddir)
 CPPFLAGS_DEFAULT += -I$(srcdir)
@@ -30,23 +49,46 @@ CPPFLAGS_DEFAULT += -I$(top_builddir)
 CPPFLAGS_DEFAULT += -I$(top_srcdir)
 CPPFLAGS_DEFAULT += -I$(top_srcdir)/include
 CPPFLAGS_DEFAULT += -I$(top_builddir)/include
+CPPFLAGS_DEFAULT += -I$(top_srcdir)/grub-core/lib/libgcrypt-grub/include
 CPPFLAGS_DEFAULT += -I$(top_srcdir)/grub-core/lib/libgcrypt-grub/src/
 CCASFLAGS_DEFAULT = $(CPPFLAGS_DEFAULT) -DASM_FILE=1
 BUILD_CPPFLAGS += $(CPPFLAGS_DEFAULT)

-CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
-LDFLAGS_KERNEL = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC)
+LDADD_KERNEL =
+
+if ! COND_i386_pc
+if ! COND_i386_efi
+if ! COND_i386_qemu
+if ! COND_i386_coreboot
+if ! COND_i386_multiboot
+if ! COND_i386_ieee1275
+if ! COND_x86_64_efi
+LDADD_KERNEL += -lgcc
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+
+CFLAGS_KERNEL = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
+LDFLAGS_KERNEL = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -static-libgcc
 CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
 CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
-STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx
+if COND_CYGWIN
+STRIPFLAGS_KERNEL = -F elf32-i386 -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version
+else
+STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment -R .note.gnu.gold-version
+endif

-CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
-LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
+CFLAGS_MODULE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
+LDFLAGS_MODULE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
 CPPFLAGS_MODULE = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
 CCASFLAGS_MODULE = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)

-CFLAGS_IMAGE = $(CFLAGS_PLATFORM) -fno-builtin
-LDFLAGS_IMAGE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-S
+CFLAGS_IMAGE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -fno-builtin
+LDFLAGS_IMAGE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-S
 CPPFLAGS_IMAGE = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
 CCASFLAGS_IMAGE = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)

@@ -65,13 +107,16 @@ grubconfdir = $(sysconfdir)/grub.d
 platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
 starfielddir = $(pkgdatadir)/themes/starfield

-CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion
+CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion -Wno-old-style-definition -Wno-unsafe-loop-optimizations
 CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/gnulib -I$(top_srcdir)/grub-core/gnulib

-CFLAGS_POSIX = -fno-builtin
-CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap
+CFLAGS_BRAILLE = -Wno-strict-prototypes -Wno-missing-field-initializers -Wno-unused-parameter -Wno-shadow -Wno-sign-compare
+CPPFLAGS_BRAILLE = -I$(top_srcdir)/grub-core/braille/brltty_wrap -I$(top_srcdir)/grub-core/braille/brltty/Programs -I$(top_srcdir)/grub-core/braille/brltty -Wno-sign-compare -DPACKAGE_REVISION=\"\" -include $(top_srcdir)/grub-core/braille/config.h

-CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers -Wno-redundant-decls -Wno-undef $(CFLAGS_POSIX)
+CFLAGS_POSIX = -fno-builtin
+CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap/include
+
+CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers -Wno-redundant-decls $(CFLAGS_POSIX)
 CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap $(CPPFLAGS_POSIX) -D_GCRYPT_IN_LIBGCRYPT=1 -I$(top_srcdir)/include/grub/gcrypt

 CPPFLAGS_EFIEMU = -I$(top_srcdir)/grub-core/efiemu/runtime
@@ -86,11 +131,9 @@ CPPFLAGS_TERMINAL_LIST += '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST
 CPPFLAGS_COMMAND_LIST = '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)'
 CPPFLAGS_COMMAND_LIST += '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)'
 CPPFLAGS_COMMAND_LIST += '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)'
-CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)'
 CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \
 	$(CPPFLAGS_PARTTOOL_LIST) $(CPPFLAGS_PARTMAP_LIST) \
-	$(CPPFLAGS_TERMINAL_LIST) $(CPPFLAGS_COMMAND_LIST) \
-	$(CPPFLAGS_FDT_LIST)
+	$(CPPFLAGS_TERMINAL_LIST) $(CPPFLAGS_COMMAND_LIST)

 # Define these variables to calm down automake

@@ -124,15 +167,20 @@ EXTRA_DIST =
 CLEANFILES =
 BUILT_SOURCES =

-# Rules for Automake input
+# Rules for autogen definition files
+
+.PRECIOUS: $(top_srcdir)/Makefile.tpl
+$(top_srcdir)/Makefile.tpl: $(top_srcdir)/gentpl.py
+	python $< | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
+	mv $@.new $@

 .PRECIOUS: $(top_srcdir)/Makefile.util.am
-$(top_srcdir)/Makefile.util.am: $(top_srcdir)/gentpl.py $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def
-	python $^ > $@.new || (rm -f $@.new; exit 1)
+$(top_srcdir)/Makefile.util.am: $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def $(top_srcdir)/Makefile.tpl
+	cat $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
 	mv $@.new $@

 .PRECIOUS: $(top_srcdir)/grub-core/Makefile.core.am
-$(top_srcdir)/grub-core/Makefile.core.am: $(top_srcdir)/gentpl.py $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def
+$(top_srcdir)/grub-core/Makefile.core.am: $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def $(top_srcdir)/Makefile.tpl
 	if [ "x$$GRUB_CONTRIB" != x ]; then echo "You need to run ./autogen.sh manually." >&2; exit 1; fi
-	python $^ > $@.new || (rm -f $@.new; exit 1)
+	cat $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
 	mv $@.new $@
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -2,21 +2,19 @@ EXTRA_DIST += autogen.sh
 EXTRA_DIST += geninit.sh

 EXTRA_DIST += gentpl.py
+EXTRA_DIST += Makefile.tpl
 EXTRA_DIST += Makefile.util.def
 EXTRA_DIST += Makefile.utilgcry.def

-EXTRA_DIST += asm-tests
 EXTRA_DIST += unicode

 EXTRA_DIST += util/import_gcry.py
 EXTRA_DIST += util/import_unicode.py

 EXTRA_DIST += docs/man
-EXTRA_DIST += docs/autoiso.cfg
 EXTRA_DIST += docs/grub.cfg
-EXTRA_DIST += docs/osdetect.cfg

-EXTRA_DIST += conf/i386-cygwin-img-ld.sc
+EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc

 EXTRA_DIST += grub-core/Makefile.core.def
 EXTRA_DIST += grub-core/Makefile.gcry.def
@@ -28,15 +26,11 @@ EXTRA_DIST += grub-core/gensymlist.sh
 EXTRA_DIST += grub-core/genemuinit.sh
 EXTRA_DIST += grub-core/genemuinitheader.sh

-EXTRA_DIST += grub-core/gnulib-fix-null-deref.diff
-EXTRA_DIST += grub-core/gnulib-fix-width.diff
-EXTRA_DIST += grub-core/gnulib-no-abort.diff
-EXTRA_DIST += grub-core/gnulib-no-gets.diff
-
 EXTRA_DIST += grub-core/lib/libgcrypt
 EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic
 EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')
 EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib -name '*.h')
+EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/gnulib -name '*.h')
 EXTRA_DIST += grub-core/efiemu/runtime/config.h

 EXTRA_DIST += grub-core/lib/LzmaDec.c
@@ -50,13 +44,8 @@ EXTRA_DIST += util/import_gcrypth.sed
 EXTRA_DIST += util/bin2h.c
 EXTRA_DIST += util/grub-gen-asciih.c
 EXTRA_DIST += util/grub-gen-widthspec.c
-EXTRA_DIST += util/grub-module-verifier.c
-EXTRA_DIST += util/grub-module-verifier32.c
-EXTRA_DIST += util/grub-module-verifier64.c
-EXTRA_DIST += util/grub-module-verifierXX.c
 EXTRA_DIST += util/grub-pe2elf.c

-
 EXTRA_DIST += m4/gnulib-cache.m4
 EXTRA_DIST += m4/glibc2.m4
 EXTRA_DIST += m4/gnulib-tool.m4
@@ -114,27 +103,3 @@ EXTRA_DIST += grub-core/osdep/windows/sleep.c
 EXTRA_DIST += tests/dfly-mbr-mbexample.mbr.img.gz
 EXTRA_DIST += tests/dfly-mbr-mbexample.dfly.img.gz

-EXTRA_DIST += coreboot.cfg
-
-EXTRA_DIST += tests/file_filter/file
-EXTRA_DIST += tests/file_filter/file.gz
-EXTRA_DIST += tests/file_filter/file.gz.sig
-EXTRA_DIST += tests/file_filter/file.lzop
-EXTRA_DIST += tests/file_filter/file.lzop.sig
-EXTRA_DIST += tests/file_filter/file.xz
-EXTRA_DIST += tests/file_filter/file.xz.sig
-EXTRA_DIST += tests/file_filter/keys
-EXTRA_DIST += tests/file_filter/keys.pub
-EXTRA_DIST += tests/file_filter/test.cfg
-EXTRA_DIST += tests/syslinux/ubuntu10.04/isolinux/prompt.cfg
-EXTRA_DIST += tests/syslinux/ubuntu10.04/isolinux/gfxboot.cfg
-EXTRA_DIST += tests/syslinux/ubuntu10.04/isolinux/adtxt.cfg
-EXTRA_DIST += tests/syslinux/ubuntu10.04/isolinux/isolinux.cfg
-EXTRA_DIST += tests/syslinux/ubuntu10.04/isolinux/exithelp.cfg
-EXTRA_DIST += tests/syslinux/ubuntu10.04/isolinux/txt.cfg
-EXTRA_DIST += tests/syslinux/ubuntu10.04/isolinux/menu.cfg
-EXTRA_DIST += tests/syslinux/ubuntu10.04/isolinux/stdmenu.cfg
-EXTRA_DIST += tests/syslinux/ubuntu10.04/isolinux/dtmenu.cfg
-EXTRA_DIST += tests/syslinux/ubuntu10.04/isolinux/po4a.cfg
-EXTRA_DIST += tests/syslinux/ubuntu10.04/isolinux/rqtxt.cfg
-EXTRA_DIST += tests/syslinux/ubuntu10.04_grub.cfg.in
--- a/conf/i386-pc-cygwin-img-ld.sc
+++ b/conf/i386-pc-cygwin-img-ld.sc
@@ -5,8 +5,6 @@ SECTIONS
  .text :
  {
    start = . ;
-    _start = . ;
-    __start = . ;
    *(.text)
    etext = . ;
  }
@@ -35,8 +33,6 @@ SECTIONS
  {
    *(.edata)
    end = . ;
-    _end = . ;
-    __end = . ;
  }
  .stab :
  {
--- a/config.h.in
+++ b/config.h.in
@@ -6,21 +6,10 @@
 #define __powerpc__ 1
 #endif

-#define GCRYPT_NO_DEPRECATED 1
-#define HAVE_MEMMOVE 1
-
 /* Define to 1 to enable disk cache statistics.  */
 #define DISK_CACHE_STATS @DISK_CACHE_STATS@
 #define BOOT_TIME_STATS @BOOT_TIME_STATS@

-/* We don't need those.  */
-#define MINILZO_CFG_SKIP_LZO_PTR 1
-#define MINILZO_CFG_SKIP_LZO_UTIL 1
-#define MINILZO_CFG_SKIP_LZO_STRING 1
-#define MINILZO_CFG_SKIP_LZO_INIT 1
-#define MINILZO_CFG_SKIP_LZO1X_1_COMPRESS 1
-#define MINILZO_CFG_SKIP_LZO1X_DECOMPRESS 1
-
 #if defined (GRUB_BUILD)
 #undef ENABLE_NLS
 #define BUILD_SIZEOF_LONG @BUILD_SIZEOF_LONG@
@@ -37,9 +26,12 @@
 #elif defined (GRUB_UTIL) || !defined (GRUB_MACHINE)
 #include <config-util.h>
 #else
-#define HAVE_FONT_SOURCE @HAVE_FONT_SOURCE@
 /* Define if C symbols get an underscore after compilation. */
 #define HAVE_ASM_USCORE @HAVE_ASM_USCORE@
+/* Define it to \"addr32\" or \"addr32;\" to make GAS happy.  */
+#define ADDR32 @ADDR32@
+/* Define it to \"data32\" or \"data32;\" to make GAS happy. */
+#define DATA32 @DATA32@
 /* Define it to one of __bss_start, edata and _edata.  */
 #define BSS_START_SYMBOL @BSS_START_SYMBOL@
 /* Define it to either end or _end.  */
@@ -56,12 +48,26 @@
 #define PACKAGE_NAME "@PACKAGE_NAME@"
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
+/* Default boot directory name" */
+#define GRUB_BOOT_DIR_NAME "@bootdirname@"
+/* Default grub directory name */
+#define GRUB_DIR_NAME "@grubdirname@"
+/* Define to 1 if GCC generates calls to __register_frame_info().  */
+#define NEED_REGISTER_FRAME_INFO @NEED_REGISTER_FRAME_INFO@

 #define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
 #define GRUB_PLATFORM "@GRUB_PLATFORM@"

 #define RE_ENABLE_I18N 1

+#define _GL_UNUSED __attribute__ ((unused))
+#define HAVE_VPRINTF 1
+#define HAVE_DECL_STRERROR 1
+#define HAVE_INLINE 1
+#define HAVE_MBRTOWC 1
+
+#define ENABLE_NLS 1
+
 #define _GNU_SOURCE 1

 #endif
--- a/configure.ac
+++ b/configure.ac
--- a/coreboot.cfg
+++ b/coreboot.cfg
@@ -1,3 +0,0 @@
-if test -f (cbfsdisk)/etc/grub.cfg; then
-   source (cbfsdisk)/etc/grub.cfg
-fi
--- a/docs/grub-dev.texi
+++ b/docs/grub-dev.texi
@@ -79,12 +79,11 @@ This edition documents version @value{VERSION}.
 * Contributing Changes::
 * Porting::
 * Error Handling::
-* Stack and heap size::
+* CIA::
 * BIOS port memory map::
 * Video Subsystem::
 * PFF2 Font File Format::
 * Graphical Menu Software Design::
-* Verifiers framework::
 * Copying This Manual::         Copying This Manual
 * Index::
@end menu
@@ -93,36 +92,24 @@ This edition documents version @value{VERSION}.
@node Getting the source code
@chapter Getting the source code

-GRUB is maintained using the @uref{GIT revision
-control system}.  To fetch:
+GRUB is maintained using the @uref{http://bazaar-vcs.org/, Bazaar revision
+control system}.  To fetch the primary development branch:

@example
-git clone git://git.sv.gnu.org/grub.git
+bzr get http://bzr.savannah.gnu.org/r/grub/trunk/grub
@end example

-Web access is available under
+The GRUB developers maintain several other branches with work in progress.
+Of these, the most interesting is the experimental branch, which is a
+staging area for new code which we expect to eventually merge into trunk but
+which is not yet ready:
+
@example
-http://git.savannah.gnu.org/cgit/grub.git/
+bzr get http://bzr.savannah.gnu.org/r/grub/branches/experimental
@end example

-The branches available are:
-
-@table @samp
-@item master
-      Main development branch.
-@item grub-legacy
-      GRUB 0.97 codebase. Kept for reference and legal reasons
-@item multiboot
-      Multiboot specfication
-@item multiboot2
-      Multiboot2 specfication
-@item developer branches
-      Prefixed with developer name. Every developer of a team manages his own branches.
-      Developer branches do not need changelog entries.
-@end table
-
-Once you have used @kbd{git clone} to fetch an initial copy of a branch, you
-can use @kbd{git pull} to keep it up to date.  If you have modified your
+Once you have used @kbd{bzr get} to fetch an initial copy of a branch, you
+can use @kbd{bzr pull} to keep it up to date.  If you have modified your
 local version, you may need to resolve conflicts when pulling.

@node Coding style
@@ -229,12 +216,12 @@ The opening @samp{/*} and closing @samp{*/} should be placed together on a line
 Here is a brief map of the GRUB code base.

 GRUB uses Autoconf and Automake, with most of the Automake input generated
-by a Python script.  The top-level build rules are in @file{configure.ac},
+by AutoGen.  The top-level build rules are in @file{configure.ac},
@file{grub-core/Makefile.core.def}, and @file{Makefile.util.def}.  Each
 block in a @file{*.def} file represents a build target, and specifies the
 source files used to build it on various platforms.  The @file{*.def} files
-are processed into Automake input by @file{gentpl.py} (which you only need
-to look at if you are extending the build system).  If you are adding a new
+are processed into AutoGen input by @file{gentpl.py} (which you only need to
+look at if you are extending the build system).  If you are adding a new
 module which follows an existing pattern, such as a new command or a new
 filesystem implementation, it is usually easiest to grep
@file{grub-core/Makefile.core.def} and @file{Makefile.util.def} for an
@@ -347,10 +334,10 @@ anymore.
@itemize
@item Always use latest GRUB 2 source code. So get that first.

-For developers it is recommended always to use the newest development version of GRUB 2. If development takes a long period of time, please remember to keep in sync with newest developments regularly so it is much easier to integrate your change in the future. GRUB 2 is being developed in a GIT repository.
+For developers it is recommended always to use the newest development version of GRUB 2. If development takes a long period of time, please remember to keep in sync with newest developments regularly so it is much easier to integrate your change in the future. GRUB 2 is being developed in a Bazaar (bzr) repository.

-Please check Savannah's GRUB project page for details how to get newest git:
-@uref{https://savannah.gnu.org/git/?group=grub, GRUB 2 git Repository}
+Please check Savannah's GRUB project page for details how to get newest bzr:
+@uref{http://savannah.gnu.org/bzr/?group=grub, GRUB 2 bzr Repository}

@item Compile it and try it out.

@@ -908,68 +895,33 @@ if (grub_errno != GRUB_ERR_NONE)
 grub_error_pop ();
@end example

-@node Stack and heap size
-@chapter Stack and heap size
+@node CIA
+@chapter CIA
+@c By Robert Millan and Carles Pina
+If you have commit access, please setup CIA in your Bazaar
+config so those in IRC receive notification of your commits.

-On emu stack and heap are just normal host OS stack and heap. Stack is typically
-8 MiB although it's OS-dependent.
+In @file{~/.bazaar/bazaar.conf}, add "cia_send_revno = true". 
+Optionally, you can also add "cia_user = myusername" if you'd
+like CIA service to use a specific account (for statistical purpose).

-On i386-pc, i386-coreboot, i386-qemu and i386-multiboot the stack is 60KiB.
-All available space between 1MiB and 4GiB marks is part of heap.
+In the @file{.bzr/branch/branch.conf} of your checkout branch,
+"set nickname = /path_to_this_branch" and "cia_project = GNU GRUB".

-On *-xen stack is 4MiB. If compiled for x86-64 with GCC 4.4 or later adressable
-space is unlimited. When compiled for x86-64 with older GCC version adressable
-space is limited to 2GiB. When compiling for i386 adressable space is limited
-to 4GiB. All adressable pages except the ones for stack, GRUB binary, special
-pages and page table are in the heap.
+Additionally, please set cia_send_revno in the [DEFAULT] section
+of your @file{~/.bazaar/bazaar.conf}. E.g.:

-On *-efi GRUB uses same stack as EFI. If compiled for x86-64 with GCC 4.4 or
-later adressable space is unlimited. When compiled for x86-64 with older GCC
-version adressable space is limited to 2GiB. For all other platforms adressable
-space is limited to 4GiB. GRUB allocates pages from EFI for its heap, at most
-1.6 GiB.
+@example
+[DEFAULT]
+cia_send_revno = true
+@end example

-On i386-ieee1275 and powerpc-ieee1275 GRUB uses same stack as IEEE1275.
-It allocates at most 32MiB for its heap.
-
-On sparc64-ieee1275 stack is 256KiB and heap is 2MiB.
-
-On mips(el)-qemu_mips and mipsel-loongson stack is 2MiB (everything below
-GRUB image) and everything above GRUB image (from 2MiB + kernel size)
-until 256MiB is part of heap.
-
-On mips-arc stack is 2MiB (everything below GRUB image) and everything above
-GRUB image(from 2MiB + kernel size) until 128MiB is part of heap.
-
-On mipsel-arc stack is 2MiB (everything below GRUB image which is not part
-of ARC) and everything above GRUB image (from 7MiB + kernel size)
-until 256MiB is part of heap.
-
-On arm-uboot stack is 256KiB and heap is 2MiB.
-
-In short:
-
-@multitable @columnfractions .15 .25 .5
-@headitem Platform @tab Stack @tab Heap
-@item emu                     @tab 8 MiB   @tab ?
-@item i386-pc                 @tab 60 KiB  @tab < 4 GiB
-@item i386-coreboot           @tab 60 KiB  @tab < 4 GiB
-@item i386-multiboot          @tab 60 KiB  @tab < 4 GiB
-@item i386-qemu               @tab 60 KiB  @tab < 4 GiB
-@item *-efi                   @tab ?       @tab < 1.6 GiB
-@item i386-ieee1275           @tab ?       @tab < 32 MiB
-@item powerpc-ieee1275        @tab ?       @tab < 32 MiB
-@item sparc64-ieee1275        @tab 256KiB  @tab 2 MiB
-@item arm-uboot               @tab 256KiB  @tab 2 MiB
-@item mips(el)-qemu_mips      @tab 2MiB    @tab 253 MiB
-@item mipsel-loongson         @tab 2MiB    @tab 253 MiB
-@item mips-arc                @tab 2MiB    @tab 125 MiB
-@item mipsel-arc              @tab 2MiB    @tab 248 MiB
-@item x86_64-xen (GCC >= 4.4) @tab 4MiB    @tab unlimited
-@item x86_64-xen (GCC < 4.4)  @tab 4MiB    @tab < 2GiB
-@item i386-xen                @tab 4MiB    @tab < 4GiB
-@end multitable
+Remember to install cia-clients (Debian/Ubuntu package) to be able to use CIA.

+Keep in mind Bazaar sends notifications for all commits to branches that have
+this setting, regardless of whether they're bound branches (checkouts) or not.
+So if you make local commits in a non-bound branch and it bothers you that
+others can read them, do not use this setting.

@node BIOS port memory map
@chapter BIOS port memory map
@@ -982,8 +934,9 @@ In short:
@item ?        @tab 0x2000 - 1   @tab Real mode stack 
@item 0x7C00   @tab 0x7D00 - 1   @tab Boot sector 
@item 0x8000   @tab ?            @tab GRUB kernel 
-@item 0x68000  @tab 0x71000 - 1  @tab Disk buffer 
+@item 0x68000  @tab 0x78000 - 1  @tab Disk buffer 
@item ?        @tab 0x80000 - 1  @tab Protected mode stack 
+@item 0x80000  @tab ?            @tab Heap 
@item ?        @tab 0xA0000 - 1  @tab Extended BIOS Data Area 
@item 0xA0000  @tab 0xC0000 - 1  @tab Video RAM 
@item 0xC0000  @tab 0x100000 - 1 @tab BIOS 
@@ -1160,47 +1113,6 @@ struct grub_video_palette_data
 Used to query indexed color palettes. If mode is RGB mode, colors will be copied from emulated palette data. In Indexed Color modes, palettes will be read from hardware. Color values will be converted to suit structure format. @code{start} will tell what hardware color index (or emulated color index) will be used as a source for first indice of @code{palette_data}, after that both hardware color index and @code{palette_data} index will be incremented until @code{count} number of colors have been read.
@end itemize

-@subsection grub_video_set_area_status
-@itemize
-
-@item Prototype:
-@example
-grub_err_t
-grub_video_set_area_status (grub_video_area_status_t area_status);
-@end example
-@example
-enum grub_video_area_status_t
-  @{
-    GRUB_VIDEO_AREA_DISABLED,
-    GRUB_VIDEO_AREA_ENABLED
-  @};
-@end example
-
-@item Description:
-
-Used to set area drawing mode for redrawing the specified region. Draw commands
-are performed in the intersection of the viewport and the region called area.
-Coordinates remain related to the viewport. If draw commands try to draw over
-the area, they are clipped.
-Set status to DISABLED if you need to draw everything.
-Set status to ENABLED and region to the desired rectangle to redraw everything
-inside the region leaving everything else intact.
-Should be used for redrawing of active elements.
-@end itemize
-
-@subsection grub_video_get_area_status
-@itemize
-
-@item Prototype:
-@example
-grub_err_r
-grub_video_get_area_status (grub_video_area_status_t *area_status);
-@end example
-
-@item Description:
-Used to query the area status.
-@end itemize
-
@subsection grub_video_set_viewport
@itemize
@item Prototype:
@@ -1227,37 +1139,6 @@ grub_video_get_viewport (unsigned int *x, unsigned int *y, unsigned int *width,
 Used to query current viewport dimensions. Software developer can use this to choose best way to render contents of the viewport.
@end itemize

-@subsection grub_video_set_region
-@itemize
-@item Prototype:
-
-@example
-grub_err_t
-grub_video_set_region (unsigned int x, unsigned int y, unsigned int width, unsigned int height);
-@end example
-@item Description:
-
-Used to specify the region of the screen which should be redrawn. Use absolute
-values. When the region is set and area status is ENABLE all draw commands will
-be performed inside the interseption of region and viewport named area.
-If draw commands try to draw over viewport, they are clipped. If developer
-requests larger than possible region, width and height will be clamped to fit
-screen. Should be used for redrawing of active elements.
-@end itemize
-
-@subsection grub_video_get_region
-@itemize
-@item Prototype:
-
-@example
-grub_err_t
-grub_video_get_region (unsigned int *x, unsigned int *y, unsigned int *width, unsigned int *height);
-@end example
-@item Description:
-
-Used to query current region dimensions.
-@end itemize
-
@subsection grub_video_map_color
@itemize
@item Prototype:
@@ -1813,9 +1694,7 @@ right edges of two adjacent glyphs.  The @strong{device width} field determines
 the effective leading value that is used to render the font.

@end itemize
-@ifnottex
-@image{font_char_metrics,,,,.png}
-@end ifnottex
+@image{font_char_metrics,,,,png}
   
 An illustration of how the various font metrics apply to characters.

@@ -1950,58 +1829,6 @@ the graphics mode that was in use before @code{grub_video_setup()} was called
 might fix some of the problems.


-@node Verifiers framework
-@chapter Verifiers framework
-
-To register your own verifier call @samp{grub_verifier_register} with a
-structure pointing to your functions.
-
-The interface is inspired by hash interface with @samp{init}/@samp{write}/@samp{fini}.
-
-There are eesntially 2 ways of using it: hashing and whole-file verification:
-
-With hashing approach:
-During @samp{init} you decide whether you want to check given file and init context.
-In @samp{write} you update you hashing state.
-In @samp{fini} you check that hash matches the expected value/passes some check/...
-
-With whole-file verification:
-During @samp{init} you decide whether you want to check given file and init context.
-In @samp{write} you verify file and return error if it fails.
-You don't have @samp{fini}.
-
-Additional @samp{verify_string} receives various strings like kernel parameters to
-verify. Returning no error means successful verification and an error stops the current
-action.
-
-Detailed description of API:
-
-Every time a file is opened your @samp{init} function is called with file descriptor
-and file type. Your function can have following outcomes:
-
-@itemize
-
-@item returning no error and setting @samp{*flags} to @samp{GRUB_VERIFY_FLAGS_SKIP_VERIFICATION}.
-In this case your verifier will not be called anymore and your verifier is considered
-to have skipped verification
-
-@item returning error. Then opening of the fail will fail due to failed verification.
-
-@item returning no error and not setting @samp{*flags} to @samp{GRUB_VERIFY_FLAGS_SKIP_VERIFICATION}
-In this case verification is done as described in following section
-
-@end itemize
-
-In the third case your @samp{write} will be called with chunks of file. If you need the whole file in a single
-chunk then during @samp{init} set bit @samp{GRUB_VERIFY_FLAGS_SINGLE_CHUNK} in @samp{*flags}.
-During @samp{init} you may set @samp{*context} if you need additional context. At every iteration you may return
-an error and the the file will be considered as having failed the verification. If you return no error then
-verification continues.
-
-Optionally at the end of the file @samp{fini} if it exists is called with just the context. If you return
-no error during any of @samp{init}, @samp{write} and @samp{fini} then the file is considered as having
-succeded verification.
-
@node Copying This Manual
@appendix Copying This Manual

--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -701,26 +701,6 @@ you may run those commands directly to install GRUB, without using
 with the internals of GRUB. Installing a boot loader on a running OS may be
 extremely dangerous.

-On EFI systems for fixed disk install you have to mount EFI System Partition.
-If you mount it at @file{/boot/efi} then you don't need any special arguments:
-
-@example
-# @kbd{grub-install}
-@end example
-
-Otherwise you need to specify where your EFI System partition is mounted:
-
-@example
-# @kbd{grub-install --efi-directory=/mnt/efi}
-@end example
-
-For removable installs you have to use @option{--removable} and specify both
-@option{--boot-directory} and @option{--efi-directory}:
-
-@example
-# @kbd{grub-install --efi-directory=/mnt/usb --boot-directory=/mnt/usb/boot --removable}
-@end example
-
@node Making a GRUB bootable CD-ROM
@section Making a GRUB bootable CD-ROM

@@ -1254,14 +1234,14 @@ Valid keys in @file{/etc/default/grub} are as follows:
@item GRUB_DEFAULT
 The default menu entry.  This may be a number, in which case it identifies
 the Nth entry in the generated menu counted from zero, or the title of a
-menu entry, or the special string @samp{saved}.  Using the id may be
+menu entry, or the special string @samp{saved}.  Using the title may be
 useful if you want to set a menu entry as the default even though there may
 be a variable number of entries before it.

 For example, if you have:

@verbatim
-menuentry 'Example GNU/Linux distribution' --class gnu-linux --id example-gnu-linux {
+menuentry 'Example GNU/Linux distribution' --class gnu-linux {
 	...
 }
@end verbatim
@@ -1269,17 +1249,12 @@ menuentry 'Example GNU/Linux distribution' --class gnu-linux --id example-gnu-li
 then you can make this the default using:

@example
-GRUB_DEFAULT=example-gnu-linux
+GRUB_DEFAULT='Example GNU/Linux distribution'
@end example

-Previously it was documented the way to use entry title. While this still
-works it's not recommended since titles often contain unstable device names
-and may be translated
-
 If you set this to @samp{saved}, then the default menu entry will be that
-saved by @samp{GRUB_SAVEDEFAULT} or @command{grub-set-default}.  This relies on
-the environment block, which may not be available in all situations
-(@pxref{Environment block}).
+saved by @samp{GRUB_SAVEDEFAULT}, @command{grub-set-default}, or
+@command{grub-reboot}.

 The default is @samp{0}.

@@ -1288,7 +1263,7 @@ If this option is set to @samp{true}, then, when an entry is selected, save
 it as a new default entry for use by future runs of GRUB.  This is only
 useful if @samp{GRUB_DEFAULT=saved}; it is a separate option because
@samp{GRUB_DEFAULT=saved} is useful without this option, in conjunction with
-@command{grub-set-default}.  Unset by default.
+@command{grub-set-default} or @command{grub-reboot}.  Unset by default.
 This option relies on the environment block, which may not be available in
 all situations (@pxref{Environment block}).

@@ -1298,26 +1273,23 @@ a key is pressed.  The default is @samp{5}.  Set to @samp{0} to boot
 immediately without displaying the menu, or to @samp{-1} to wait
 indefinitely.

-If @samp{GRUB_TIMEOUT_STYLE} is set to @samp{countdown} or @samp{hidden},
-the timeout is instead counted before the menu is displayed.
+@item GRUB_HIDDEN_TIMEOUT
+Wait this many seconds for @key{ESC} to be pressed before displaying the menu.
+If no @key{ESC} is pressed during that time, display the menu for the number of
+seconds specified in GRUB_TIMEOUT before booting the default entry. We expect
+that most people who use GRUB_HIDDEN_TIMEOUT will want to have GRUB_TIMEOUT set 
+to @samp{0} so that the menu is not displayed at all unless @key{ESC} is
+pressed.
+Unset by default.

-@item GRUB_TIMEOUT_STYLE
-If this option is unset or set to @samp{menu}, then GRUB will display the
-menu and then wait for the timeout set by @samp{GRUB_TIMEOUT} to expire
-before booting the default entry.  Pressing a key interrupts the timeout.
-
-If this option is set to @samp{countdown} or @samp{hidden}, then, before
-displaying the menu, GRUB will wait for the timeout set by
-@samp{GRUB_TIMEOUT} to expire.  If @key{ESC} is pressed during that time, it
-will display the menu and wait for input.  If a hotkey associated with a
-menu entry is pressed, it will boot the associated menu entry immediately.
-If the timeout expires before either of these happens, it will boot the
-default entry.  In the @samp{countdown} case, it will show a one-line
-indication of the remaining time.
+@item GRUB_HIDDEN_TIMEOUT_QUIET
+In conjunction with @samp{GRUB_HIDDEN_TIMEOUT}, set this to @samp{true} to
+suppress the verbose countdown while waiting for a key to be pressed before
+displaying the menu.  Unset by default.

@item GRUB_DEFAULT_BUTTON
@itemx GRUB_TIMEOUT_BUTTON
-@itemx GRUB_TIMEOUT_STYLE_BUTTON
+@itemx GRUB_HIDDEN_TIMEOUT_BUTTON
@itemx GRUB_BUTTON_CMOS_ADDRESS
 Variants of the corresponding variables without the @samp{_BUTTON} suffix,
 used to support vendor-specific power buttons.  @xref{Vendor power-on keys}.
@@ -1454,22 +1426,6 @@ Normally, @command{grub-mkconfig} will try to use the external
 systems installed on the same system and generate appropriate menu entries
 for them.  Set this option to @samp{true} to disable this.

-@item GRUB_OS_PROBER_SKIP_LIST
-List of space-separated FS UUIDs of filesystems to be ignored from os-prober
-output. For efi chainloaders it's <UUID>@@<EFI FILE>
-
-@item GRUB_DISABLE_SUBMENU
-Normally, @command{grub-mkconfig} will generate top level menu entry for
-the kernel with highest version number and put all other found kernels
-or alternative menu entries for recovery mode in submenu. For entries returned
-by @command{os-prober} first entry will be put on top level and all others
-in submenu. If this option is set to @samp{y}, flat menu with all entries
-on top level will be generated instead. Changing this option will require
-changing existing values of @samp{GRUB_DEFAULT}, @samp{fallback} (@pxref{fallback})
-and @samp{default} (@pxref{default}) environment variables as well as saved
-default entry using @command{grub-set-default} and value used with
-@command{grub-reboot}.
-
@item GRUB_ENABLE_CRYPTODISK
 If set to @samp{y}, @command{grub-mkconfig} and @command{grub-install} will
 check for encrypted disks and generate additional commands needed to access
@@ -1492,44 +1448,6 @@ Each module will be loaded as early as possible, at the start of

@end table

-The following options are still accepted for compatibility with existing
-configurations, but have better replacements:
-
-@table @samp
-@item GRUB_HIDDEN_TIMEOUT
-Wait this many seconds before displaying the menu.  If @key{ESC} is pressed
-during that time, display the menu and wait for input according to
-@samp{GRUB_TIMEOUT}.  If a hotkey associated with a menu entry is pressed,
-boot the associated menu entry immediately.  If the timeout expires before
-either of these happens, display the menu for the number of seconds
-specified in @samp{GRUB_TIMEOUT} before booting the default entry.
-
-If you set @samp{GRUB_HIDDEN_TIMEOUT}, you should also set
-@samp{GRUB_TIMEOUT=0} so that the menu is not displayed at all unless
-@key{ESC} is pressed.
-
-This option is unset by default, and is deprecated in favour of the less
-confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
-@samp{GRUB_TIMEOUT_STYLE=hidden}.
-
-@item GRUB_HIDDEN_TIMEOUT_QUIET
-In conjunction with @samp{GRUB_HIDDEN_TIMEOUT}, set this to @samp{true} to
-suppress the verbose countdown while waiting for a key to be pressed before
-displaying the menu.
-
-This option is unset by default, and is deprecated in favour of the less
-confusing @samp{GRUB_TIMEOUT_STYLE=countdown}.
-
-@item GRUB_HIDDEN_TIMEOUT_BUTTON
-Variant of @samp{GRUB_HIDDEN_TIMEOUT}, used to support vendor-specific power
-buttons.  @xref{Vendor power-on keys}.
-
-This option is unset by default, and is deprecated in favour of the less
-confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
-@samp{GRUB_TIMEOUT_STYLE=hidden}.
-
-@end table
-
 For more detailed customisation of @command{grub-mkconfig}'s output, you may
 edit the scripts in @file{/etc/grub.d} directly.
@file{/etc/grub.d/40_custom} is particularly useful for adding entire custom
@@ -2446,10 +2364,6 @@ The boot file name provided by DHCP.  Read-only.
 The name of the DHCP server responsible for these boot parameters.
 Read-only.

-@item net_@var{<interface>}_next_server
-The IP address of the next (usually, TFTP) server provided by DHCP.
-Read-only.
-
@item net_default_interface
 Initially set to name of network interface that was used to load grub.
 Read-write, although setting it affects only interpretation of
@@ -2522,28 +2436,23 @@ menu requires several fancy features of your terminal.
@node Vendor power-on keys
@chapter Using GRUB with vendor power-on keys

-Some laptop vendors provide an additional power-on button which boots
-another OS.  GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON},
-@samp{GRUB_TIMEOUT_STYLE_BUTTON}, @samp{GRUB_DEFAULT_BUTTON}, and
+Some laptop vendors provide an additional power-on button which boots another
+OS.  GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON},
+@samp{GRUB_DEFAULT_BUTTON}, @samp{GRUB_HIDDEN_TIMEOUT_BUTTON} and
@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in default/grub (@pxref{Simple
-configuration}).  @samp{GRUB_TIMEOUT_BUTTON},
-@samp{GRUB_TIMEOUT_STYLE_BUTTON}, and @samp{GRUB_DEFAULT_BUTTON} are used
-instead of the corresponding variables without the @samp{_BUTTON} suffix
-when powered on using the special button.  @samp{GRUB_BUTTON_CMOS_ADDRESS}
-is vendor-specific and partially model-specific.  Values known to the GRUB
-team are:
+configuration}).  @samp{GRUB_TIMEOUT_BUTTON}, @samp{GRUB_DEFAULT_BUTTON} and
+@samp{GRUB_HIDDEN_TIMEOUT_BUTTON} are used instead of the corresponding
+variables without the @samp{_BUTTON} suffix when powered on using the special
+button.  @samp{GRUB_BUTTON_CMOS_ADDRESS} is vendor-specific and partially
+model-specific.  Values known to the GRUB team are:

@table @key
-@item Dell XPS M1330M
-121:3
@item Dell XPS M1530
 85:3
@item Dell Latitude E4300
 85:3
@item Asus EeePC 1005PE 
 84:1 (unconfirmed)
-@item LENOVO ThinkPad T410s (2912W1C)
-101:3
@end table

 To take full advantage of this function, install GRUB into the MBR
@@ -2717,7 +2626,6 @@ Heavily limited platforms:
 Lightly limited platforms:

@itemize
-@item *-xen: limited only by adress space and RAM size.
@item i386-qemu: kernel.img (.text + .data + .bss) is limited by 392704 bytes.
                 (core.img would be limited by ROM size but it's unlimited on qemu
@item All EFI platforms: limited by contiguous RAM size and possibly firmware bugs
@@ -2773,9 +2681,9 @@ by a digit, like @samp{fd0}, or @samp{cd}.
 AHCI, PATA (ata), crypto, USB use the name of driver followed by a number.
 Memdisk and host are limited to one disk and so it's refered just by driver
 name.
-RAID (md), ofdisk (ieee1275 and nand), LVM (lvm), LDM, virtio (vdsk)
-and arcdisk (arc) use intrinsic name of disk prefixed by driver name.
-Additionally just ``nand'' refers to the disk aliased as ``nand''.
+RAID (md), ofdisk (ieee1275 and nand), LVM (lvm), LDM and arcdisk (arc) use
+intrinsic name of disk prefixed by driver name. Additionally just ``nand''
+refers to the disk aliased as ``nand''.
 Conflicts are solved by suffixing a number if necessarry.
 Commas need to be escaped.
 Loopback uses whatever name specified to @command{loopback} command.
@@ -3041,11 +2949,8 @@ These variables have special meaning to GRUB.
 * biosnum::
 * check_signatures::
 * chosen::
-* cmdpath::
 * color_highlight::
 * color_normal::
-* config_directory::
-* config_file::
 * debug::
 * default::
 * fallback::
@@ -3066,7 +2971,6 @@ These variables have special meaning to GRUB.
 * net_@var{<interface>}_hostname::
 * net_@var{<interface>}_ip::
 * net_@var{<interface>}_mac::
-* net_@var{<interface>}_next_server::
 * net_@var{<interface>}_rootpath::
 * net_default_interface::
 * net_default_ip::
@@ -3081,7 +2985,6 @@ These variables have special meaning to GRUB.
 * superusers::
 * theme::
 * timeout::
-* timeout_style::
@end menu


@@ -3115,16 +3018,6 @@ the titles of each of the submenus starting from the top level followed by
 the title of the menu entry itself, separated by @samp{>}.


-@node cmdpath
-@subsection cmdpath
-
-The location from which @file{core.img} was loaded as an absolute
-directory name (@pxref{File name syntax}).  This is set by GRUB at
-startup based on information returned by platform firmware.  Not every
-platform provides this information and some may return only device
-without path name.
-
-
@node color_highlight
@subsection color_highlight

@@ -3132,7 +3025,7 @@ This variable contains the ``highlight'' foreground and background terminal
 colors, separated by a slash (@samp{/}).  Setting this variable changes
 those colors.  For the available color names, @pxref{color_normal}.

-The default is @samp{black/light-gray}.
+The default is @samp{black/white}.


@node color_normal
@@ -3161,7 +3054,7 @@ those colors.  Each color must be a name from the following list:
@item white
@end itemize

-The default is @samp{light-gray/black}.
+The default is @samp{white/black}.

 The color support support varies from terminal to terminal.

@@ -3189,74 +3082,40 @@ matching colors of first half.
 to support whole rgb24 palette but currently there is no compelling reason
 to go beyond the current 16 colors.

-
-@node config_directory
-@subsection config_directory
-
-This variable is automatically set by GRUB to the directory part of
-current configuration file name (@pxref{config_file}).
-
-
-@node config_file
-@subsection config_file
-
-This variable is automatically set by GRUB to the name of configuration file that is being
-processed by commands @command{configfile} (@pxref{configfile}) or @command{normal}
-(@pxref{normal}).  It is restored to the previous value when command completes.
-
-
@node debug
@subsection debug

 This variable may be set to enable debugging output from various components
 of GRUB.  The value is a list of debug facility names separated by
 whitespace or @samp{,}, or @samp{all} to enable all available debugging
-output. The facility names are the first argument to grub_dprintf. Consult
-source for more details.
+output.


@node default
@subsection default

-If this variable is set, it identifies a menu entry that should be
-selected by default, possibly after a timeout (@pxref{timeout}).  The
-entry may be identified by number (starting from 0 at each level of
-the hierarchy), by title, or by id.
+If this variable is set, it identifies a menu entry that should be selected
+by default, possibly after a timeout (@pxref{timeout}).  The entry may be
+identified by number or by title.

-For example, if you have:
-
-@verbatim
-menuentry 'Example GNU/Linux distribution' --class gnu-linux --id example-gnu-linux {
-	...
-}
-@end verbatim
-
-then you can make this the default using:
+If the entry is in a submenu, then it must be identified using the titles of
+each of the submenus starting from the top level followed by the number or
+title of the menu entry itself, separated by @samp{>}.  For example, take
+the following menu structure:

@example
-default=example-gnu-linux
+Submenu 1
+  Menu Entry 1
+  Menu Entry 2
+Submenu 2
+  Submenu 3
+    Menu Entry 3
+    Menu Entry 4
+  Menu Entry 5
@end example

-If the entry is in a submenu, then it must be identified using the
-number, title, or id of each of the submenus starting from the top
-level, followed by the number, title, or id of the menu entry itself,
-with each element separated by @samp{>}.  For example, take the
-following menu structure:
-
-@example
-GNU/Hurd --id gnu-hurd
-  Standard Boot --id=gnu-hurd-std
-  Rescue shell --id=gnu-hurd-rescue
-Other platforms --id=other
-  Minix --id=minix
-    Version 3.4.0 --id=minix-3.4.0
-    Version 3.3.0 --id=minix-3.3.0
-  GRUB Invaders --id=grub-invaders
-@end example
-
-The more recent release of Minix would then be identified as
-@samp{Other platforms>Minix>Version 3.4.0}, or as @samp{1>0>0}, or as
-@samp{other>minix>minix-3.4.0}.
+``Menu Entry 3'' would then be identified as
+@samp{Submenu 2>Submenu 3>Menu Entry 3}.

 This variable is often set by @samp{GRUB_DEFAULT} (@pxref{Simple
 configuration}), @command{grub-set-default}, or @command{grub-reboot}.
@@ -3277,8 +3136,7 @@ If this variable is set, it sets the resolution used on the @samp{gfxterm}
 graphical terminal.  Note that you can only use modes which your graphics
 card supports via VESA BIOS Extensions (VBE), so for example native LCD
 panel resolutions may not be available.  The default is @samp{auto}, which
-selects a platform-specific default that should look reasonable. Supported
-modes can be listed by @samp{videoinfo} command in GRUB.
+selects a platform-specific default that should look reasonable.

 The resolution may be specified as a sequence of one or more modes,
 separated by commas (@samp{,}) or semicolons (@samp{;}); each will be tried
@@ -3430,12 +3288,6 @@ The default is the value of @samp{color_normal} (@pxref{color_normal}).
@xref{Network}.


-@node net_@var{<interface>}_next_server
-@subsection net_@var{<interface>}_next_server
-
-@xref{Network}.
-
-
@node net_@var{<interface>}_rootpath
@subsection net_@var{<interface>}_rootpath

@@ -3539,21 +3391,8 @@ keyboard input before booting the default menu entry.  A timeout of @samp{0}
 means to boot the default entry immediately without displaying the menu; a
 timeout of @samp{-1} (or unset) means to wait indefinitely.

-If @samp{timeout_style} (@pxref{timeout_style}) is set to @samp{countdown}
-or @samp{hidden}, the timeout is instead counted before the menu is
-displayed.
-
-This variable is often set by @samp{GRUB_TIMEOUT} (@pxref{Simple
-configuration}).
-
-
-@node timeout_style
-@subsection timeout_style
-
-This variable may be set to @samp{menu}, @samp{countdown}, or @samp{hidden}
-to control the way in which the timeout (@pxref{timeout}) interacts with
-displaying the menu.  See the documentation of @samp{GRUB_TIMEOUT_STYLE}
-(@pxref{Simple configuration}) for details.
+This variable is often set by @samp{GRUB_TIMEOUT} or
+@samp{GRUB_HIDDEN_TIMEOUT} (@pxref{Simple configuration}).


@node Environment block
@@ -3873,11 +3712,6 @@ you forget a command, you can run the command @command{help}
@comment * vbeinfo::                     List available video modes
 * verify_detached::             Verify detached digital signature
 * videoinfo::                   List available video modes
-@comment * xen_*::              Xen boot commands
-* xen_hypervisor::              Load xen hypervisor binary
-* xen_linux::                   Load dom0 kernel for xen hypervisor
-* xen_initrd::                  Load dom0 initrd for dom0 kernel
-* xen_xsm::                     Load xen security module for xen hypervisor
@end menu


@@ -4089,15 +3923,12 @@ after @command{configfile} returns.
@node cpuid
@subsection cpuid

-@deffn Command cpuid [-l] [-p]
+@deffn Command cpuid [-l]
 Check for CPU features.  This command is only available on x86 systems.

 With the @option{-l} option, return true if the CPU supports long mode
 (64-bit).

-With the @option{-p} option, return true if the CPU supports Physical
-Address Extension (PAE).
-
 If invoked without options, this command currently behaves as if it had been
 invoked with @option{-l}.  This may change in the future.
@end deffn
@@ -4518,7 +4349,7 @@ List devices or files.
 With no arguments, print all devices known to GRUB.

 If the argument is a device name enclosed in parentheses (@pxref{Device
-syntax}), then print the name of the filesystem of that device.
+syntax}), then list all files at the root directory of that device.

 If the argument is a directory given as an absolute file name (@pxref{File
 name syntax}), then list the contents of that directory.
@@ -4981,8 +4812,7 @@ Alias for @code{hashsum --hash sha512 arg @dots{}}. See command @command{hashsum
@deffn Command sleep [@option{--verbose}] [@option{--interruptible}] count
 Sleep for @var{count} seconds. If option @option{--interruptible} is given,
 allow @key{ESC} to interrupt sleep. With @option{--verbose} show countdown
-of remaining seconds. Exit code is set to 0 if timeout expired and to 1
-if timeout was interrupted by @key{ESC}.
+of remaining seconds.
@end deffn


@@ -5061,8 +4891,6 @@ the length of @var{string} is zero
@var{expression} is false
@item @var{expression1} @code{-a} @var{expression2}
 both @var{expression1} and @var{expression2} are true
-@item @var{expression1} @var{expression2}
-both @var{expression1} and @var{expression2} are true. This syntax is not POSIX-compliant and is not recommended.
@item @var{expression1} @code{-o} @var{expression2}
 either @var{expression1} or @var{expression2} is true
@end table
@@ -5146,39 +4974,6 @@ successfully.  If validation fails, it is set to a non-zero value.
 List available video modes. If resolution is given, show only matching modes.
@end deffn

-@node xen_hypervisor
-@subsection xen_hypervisor
-
-@deffn Command xen_hypervisor file  [arguments] @dots{}
-Load a Xen hypervisor binary from @var{file}. The rest of the line is passed
-verbatim as the @dfn{kernel command-line}. Any other binaries must be
-reloaded after using this command.
-@end deffn
-
-@node xen_linux
-@subsection xen_linux
-
-@deffn Command xen_linux file [arguments]
-Load a dom0 kernel image for xen hypervisor at the booting process of xen.
-The rest of the line is passed verbatim as the module command line.
-@end deffn
-
-@node xen_initrd
-@subsection xen_initrd
-
-@deffn Command xen_initrd file
-Load a initrd image for dom0 kernel at the booting process of xen.
-@end deffn
-
-@node xen_xsm
-@subsection xen_xsm
-
-@deffn Command xen_xsm file
-Load a xen security module for xen hypervisor at the booting process of xen.
-See @uref{http://wiki.xen.org/wiki/XSM} for more detail.
-@end deffn
-
-
@node Networking commands
@section The list of networking commands

@@ -5239,10 +5034,8 @@ by @var{shortname} which can be used to remove it (@pxref{net_del_route}).
 Perform configuration of @var{card} using DHCP protocol. If no card name
 is specified, try to configure all existing cards. If configuration was
 successful, interface with name @var{card}@samp{:dhcp} and configured
-address is added to @var{card}.
-@comment If server provided gateway information in
-@comment DHCP ACK packet, it is added as route entry with the name @var{card}@samp{:dhcp:gw}.
-Additionally the following DHCP options are recognized and processed:
+address is added to @var{card}. If server provided gateway information in
+DHCP ACK packet, it is added as route entry with the name @var{card}@samp{:dhcp:gw}. Additionally the following DHCP options are recognized and processed:

@table @samp
@item 1 (Subnet Mask)
@@ -5356,14 +5149,12 @@ is given, use default list of servers.


@node Internationalisation
-@chapter Internationalisation
-
-@section Charset
+@chapter Charset
 GRUB uses UTF-8 internally other than in rendering where some GRUB-specific
 appropriate representation is used. All text files (including config) are
 assumed to be encoded in UTF-8.

-@section Filesystems
+@chapter Filesystems
 NTFS, JFS, UDF, HFS+, exFAT, long filenames in FAT, Joliet part of
 ISO9660 are treated as UTF-16 as per specification. AFS and BFS are read
 as UTF-8, again according to specification. BtrFS, cpio, tar, squash4, minix,
@@ -5397,7 +5188,7 @@ treated as distinct from u+combining diaresis. This however means that in
 order to access file on HFS+ its name must be specified in normalisation form D.
 On normalized ZFS subvolumes filenames out of normalisation are inaccessible.

-@section Output terminal
+@chapter Output terminal
 Firmware output console ``console'' on ARC and IEEE1275 are limited to ASCII.

 BIOS firmware console and VGA text are limited to ASCII and some pseudographics.
@@ -5431,7 +5222,7 @@ called ``annotation characters'' If you can complete either of
 two lists or, better, propose a patch to improve rendering, please contact
 developer team.

-@section Input terminal
+@chapter Input terminal
 Firmware console on BIOS, IEEE1275 and ARC doesn't allow you to enter non-ASCII
 characters. EFI specification allows for such but author is unaware of any
 actual implementations. Serial input is currently limited for latin1 (unlikely
@@ -5441,15 +5232,15 @@ So no dead keys or advanced input method. Also there is no keymap change hotkey.
 In practice it makes difficult to enter any text using non-Latin alphabet.
 Moreover all current input consumers are limited to ASCII.

-@section Gettext
+@chapter Gettext
 GRUB supports being translated. For this you need to have language *.mo files in $prefix/locale, load gettext module and set ``lang'' variable.

-@section Regexp
+@chapter Regexp
 Regexps work on unicode characters, however no attempt at checking cannonical
 equivalence has been made. Moreover the classes like [:alpha:] match only
 ASCII subset.

-@section Other
+@chapter Other
 Currently GRUB always uses YEAR-MONTH-DAY HOUR:MINUTE:SECOND [WEEKDAY] 24-hour
 datetime format but weekdays are translated.
 GRUB always uses the decimal number format with [0-9] as digits and . as
@@ -5505,12 +5296,10 @@ In order to enable authentication support, the @samp{superusers} environment
 variable must be set to a list of usernames, separated by any of spaces,
 commas, semicolons, pipes, or ampersands.  Superusers are permitted to use
 the GRUB command line, edit menu entries, and execute any menu entry.  If
-@samp{superusers} is set, then use of the command line and editing of menu
-entries are automatically restricted to superusers. Setting @samp{superusers}
-to empty string effectively disables both access to CLI and editing of menu
-entries.
+@samp{superusers} is set, then use of the command line is automatically
+restricted to superusers.

-Other users may be allowed to execute specific menu entries by giving a list of
+Other users may be given access to specific menu entries by giving a list of
 usernames (as above) using the @option{--users} option to the
@samp{menuentry} command (@pxref{menuentry}).  If the @option{--unrestricted}
 option is used for a menu entry, then that entry is unrestricted.
@@ -5580,8 +5369,9 @@ may halt or otherwise impact the boot process.

 GRUB uses GPG-style detached signatures (meaning that a file
@file{foo.sig} will be produced when file @file{foo} is signed), and
-currently supports the DSA and RSA signing algorithms. A signing key
-can be generated as follows:
+currently supports the DSA signing algorithm.  Both 2048-bit and
+3072-bit keys are supported. A signing key can be generated as
+follows:

@example
 gpg --gen-key
@@ -5690,16 +5480,6 @@ BadRAM is the ability to mark some of the RAM as ``bad''. Note: due to protocol
 limitations mips-loongson (with Linux protocol)
 and mips-qemu_mips can use only memory up to first hole.

-Bootlocation is ability of GRUB to automatically detect where it boots from.
-``disk'' means the detection is limited to detecting the disk with partition
-being discovered on install time. ``partition'' means that disk and partiton
-can be automatically discovered. ``file'' means that boot image file name as
-well as disk and partition can be discovered. For consistency default install ignores
-partition and relies solely on disk detection. If no bootlocation discovery is available
-or boot and grub-root disks are different, UUID is used instead. On ARC if no device
-to install to is specified, UUID is used instead as well.
-
-
@multitable @columnfractions .20 .20 .20 .20 .20
@item                    @tab BIOS    @tab Coreboot @tab Multiboot    @tab Qemu 
@item video              @tab yes     @tab yes      @tab yes          @tab yes
@@ -5716,7 +5496,6 @@ to install to is specified, UUID is used instead as well.
@item badram             @tab yes     @tab yes      @tab yes          @tab yes
@item compression        @tab always  @tab pointless @tab no           @tab no
@item exit               @tab yes     @tab no       @tab no           @tab no
-@item bootlocation       @tab disk    @tab no       @tab no           @tab no
@end multitable

@multitable @columnfractions .20 .20 .20 .20 .20
@@ -5735,7 +5514,6 @@ to install to is specified, UUID is used instead as well.
@item badram             @tab yes         @tab yes       @tab no            @tab yes
@item compression        @tab no          @tab no        @tab no            @tab no
@item exit               @tab yes         @tab yes       @tab yes           @tab yes
-@item bootlocation       @tab file        @tab file      @tab file, ignored @tab file
@end multitable

@multitable @columnfractions .20 .20 .20 .20 .20
@@ -5754,26 +5532,24 @@ to install to is specified, UUID is used instead as well.
@item badram             @tab yes (*)     @tab no      @tab no      @tab no
@item compression        @tab configurable @tab no     @tab no      @tab configurable
@item exit               @tab no          @tab yes     @tab yes     @tab yes
-@item bootlocation       @tab no          @tab partition @tab file  @tab file (*)
@end multitable

@multitable @columnfractions .20 .20 .20 .20 .20
-@item                    @tab MIPS qemu @tab emu         @tab xen
-@item video              @tab no        @tab yes         @tab no
-@item console charset    @tab CP437     @tab Unicode (*) @tab ASCII
-@item network            @tab no        @tab yes         @tab no
-@item ATA/AHCI           @tab yes       @tab no          @tab no
-@item AT keyboard        @tab yes       @tab no          @tab no
-@item Speaker            @tab no        @tab no          @tab no
-@item USB                @tab N/A       @tab yes         @tab no
-@item chainloader        @tab yes       @tab no          @tab yes
-@item cpuid              @tab no        @tab no          @tab yes
-@item hints              @tab guess     @tab no          @tab no
-@item PCI                @tab no        @tab no          @tab no
-@item badram             @tab yes (*)   @tab no          @tab no
-@item compression        @tab configurable @tab no       @tab no
-@item exit               @tab no        @tab yes         @tab no
-@item bootlocation       @tab no        @tab file        @tab no
+@item                    @tab MIPS qemu @tab emu
+@item video              @tab no        @tab yes
+@item console charset    @tab CP437     @tab Unicode (*)
+@item network            @tab no        @tab yes
+@item ATA/AHCI           @tab yes       @tab no
+@item AT keyboard        @tab yes       @tab no
+@item Speaker            @tab no        @tab no
+@item USB                @tab N/A       @tab yes
+@item chainloader        @tab yes       @tab no
+@item cpuid              @tab no        @tab no
+@item hints              @tab guess     @tab no
+@item PCI                @tab no        @tab no
+@item badram             @tab yes (*)   @tab no
+@item compression        @tab configurable @tab no
+@item exit               @tab no        @tab yes
@end multitable

@node Platform-specific operations
@@ -5935,7 +5711,7 @@ X86 support is summarised in the following table. ``Yes'' means that the kernel
 PowerPC, IA64 and Sparc64 ports support only Linux. MIPS port supports Linux
 and multiboot2.

-@section Boot tests
+@chapter Boot tests

 As you have seen in previous chapter the support matrix is pretty big and some of the configurations are only rarely used. To ensure the quality bootchecks are available for all x86 targets except EFI chainloader, Appleloader and XNU. All x86 platforms have bootcheck facility except ieee1275. Multiboot, multiboot2, BIOS chainloader, ntldr and freebsd-bootloader boot targets are tested only with a fake kernel images. Only Linux is tested among the payloads using Linux protocols.

@@ -5943,7 +5719,7 @@ Following variables must be defined:

@multitable  @columnfractions .30 .65
@item GRUB_PAYLOADS_DIR @tab directory containing the required kernels
-@item GRUB_CBFSTOOL @tab cbfstool from Coreboot package (for coreboot platform only)
+@item GRUB_CBFSTOOL @tab cbfstoll from Coreboot package (for coreboot platform only)
@item GRUB_COREBOOT_ROM @tab empty Coreboot ROM
@item GRUB_QEMU_OPTS @tab additional options to be supplied to QEMU
@end multitable
@@ -6089,21 +5865,9 @@ mounted on
 Recheck the device map, even if @file{/boot/grub/device.map} already
 exists. You should use this option whenever you add/remove a disk
 into/from your computer.
-
-@item --no-rs-codes
-By default on x86 BIOS systems, @command{grub-install} will use some
-extra space in the bootloader embedding area for Reed-Solomon
-error-correcting codes. This enables GRUB to still boot successfully
-if some blocks are corrupted.  The exact amount of protection offered
-is dependent on available space in the embedding area.  R sectors of
-redundancy can tolerate up to R/2 corrupted sectors. This
-redundancy may be cumbersome if attempting to cryptographically
-validate the contents of the bootloader embedding area, or in more
-modern systems with GPT-style partition tables (@pxref{BIOS
-installation}) where GRUB does not reside in any unpartitioned space
-outside of the MBR.  Disable the Reed-Solomon codes with this option.
@end table

+
@node Invoking grub-mkconfig
@chapter Invoking grub-mkconfig

@@ -6480,7 +6244,7 @@ just do:
@end group
@end example

-Also, the latest version is available using Git. See
+Also, the latest version is available using Bazaar. See
@uref{http://www.gnu.org/software/grub/grub-download.html} for more
 information.

--- a/docs/man/grub-file.h2m
+++ b/docs/man/grub-file.h2m
@@ -1,2 +0,0 @@
-[NAME]
-grub-file \- check file type
--- a/docs/man/grub-macbless.h2m
+++ b/docs/man/grub-macbless.h2m
@@ -1,4 +0,0 @@
-[NAME]
-grub-macbless \- bless a mac file/directory
-[SEE ALSO]
-.BR grub-install (1)
--- a/docs/man/grub-syslinux2cfg.h2m
+++ b/docs/man/grub-syslinux2cfg.h2m
@@ -1,4 +0,0 @@
-[NAME]
-grub-syslinux2cfg \- transform syslinux config into grub.cfg
-[SEE ALSO]
-.BR grub-menulst2cfg (8)
--- a/docs/osdetect.cfg
+++ b/docs/osdetect.cfg
@@ -178,12 +178,6 @@ for dev in (*); do
    # uuid: filesystem UUID
    probe -s uuid -u $dev

-    if test -f ($device)/isolinux/isolinux.cfg ; then
-	menuentry "ISOLINUX config (on $device)" $device {
-	    set root=$2
-	    syslinux_configfile -i /isolinux/isolinux.cfg
-	}
-    fi
    if test -f ($device)/bootmgr -a -f ($device)/boot/bcd; then
 	menuentry "Windows Vista bootmgr (on $device)" $device {
 	    set root=$2
--- a/gentpl.py
+++ b/gentpl.py
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -10,6 +10,10 @@ CCAS=$(TARGET_CC)
 RANLIB=$(TARGET_RANLIB)
 STRIP=$(TARGET_STRIP)

+if COND_HAVE_FONT_SOURCE
+TARGET_CFLAGS += -DUSE_ASCII_FALLBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1
+endif
+
 MACHO2IMG=$(top_builddir)/grub-macho2img

 AM_CFLAGS = $(TARGET_CFLAGS)
@@ -26,26 +30,17 @@ CFLAGS_LIBRARY += $(CFLAGS_PLATFORM) -fno-builtin
 CPPFLAGS_LIBRARY += $(CPPFLAGS_PLATFORM)
 CCASFLAGS_LIBRARY += $(CCASFLAGS_PLATFORM)

-build-grub-pep2elf$(BUILD_EXEEXT): $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_BUILD=1 -DGRUB_TARGET_WORDSIZE=64 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pep2elf\" $^
-CLEANFILES += build-grub-pep2elf$(BUILD_EXEEXT)
-
-build-grub-pe2elf$(BUILD_EXEEXT): $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_BUILD=1 -DGRUB_TARGET_WORDSIZE=32 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pe2elf\" $^
-CLEANFILES += build-grub-pe2elf$(BUILD_EXEEXT)
+build-grub-pe2elf: $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pe2elf\" $^

 # gentrigtables
-gentrigtables$(BUILD_EXEEXT): gentrigtables.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) $< $(BUILD_LIBM)
-CLEANFILES += gentrigtables$(BUILD_EXEEXT)
-
-build-grub-module-verifier$(BUILD_EXEEXT): $(top_srcdir)/util/grub-module-verifier.c $(top_srcdir)/util/grub-module-verifier32.c $(top_srcdir)/util/grub-module-verifier64.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-module-verifier\" $^
-CLEANFILES += build-grub-module-verifier$(BUILD_EXEEXT)
+gentrigtables: gentrigtables.c
+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< $(BUILD_LIBM)
+CLEANFILES += gentrigtables

 # trigtables.c
-trigtables.c: gentrigtables$(BUILD_EXEEXT) gentrigtables.c $(top_srcdir)/configure.ac
-	./gentrigtables$(BUILD_EXEEXT) > $@
+trigtables.c: gentrigtables gentrigtables.c $(top_srcdir)/configure.ac
+	./gentrigtables > $@
 CLEANFILES += trigtables.c

 # XXX Use Automake's LEX & YACC support
@@ -80,11 +75,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
-if COND_emu
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/compiler-rt-emu.h
-else
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/compiler-rt.h
-endif
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
@@ -92,6 +82,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/memory.h

 if COND_i386_pc
@@ -105,25 +96,23 @@ if COND_i386_efi
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pmtimer.h
 endif

 if COND_i386_coreboot
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/coreboot/lbio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/coreboot/lbio.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/i386/pc/int.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h
 endif

 if COND_i386_multiboot
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/i386/pc/int.h
 endif

 if COND_i386_qemu
@@ -139,37 +128,16 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
 endif

-if COND_i386_xen
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/xen.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/xen/hypercall.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-endif
-
-if COND_x86_64_xen
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/xen.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/x86_64/xen/hypercall.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-endif
-
 if COND_x86_64_efi
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pmtimer.h
 endif

 if COND_ia64_efi
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h
 endif

 if COND_mips
@@ -185,6 +153,7 @@ endif
 if COND_mips_qemu_mips
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/serial.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
@@ -196,6 +165,7 @@ if COND_mips_loongson
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/time.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
@@ -236,35 +206,12 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/uboot/uboot.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/uboot/disk.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
-endif
-
-if COND_arm_coreboot
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdt.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dma.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/coreboot/kernel.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdtbus.h
 endif

 if COND_arm_efi
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/efi/loader.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h
-endif
-
-if COND_arm64_efi
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h
 endif

 if COND_emu
@@ -277,6 +224,9 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
 if COND_GRUB_EMU_SDL
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h
 endif
+if COND_GRUB_EMU_USB
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libusb.h
+endif
 if COND_GRUB_EMU_PCI
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libpciaccess.h
 endif
@@ -292,7 +242,7 @@ BUILT_SOURCES += symlist.h

 symlist.c: symlist.h gensymlist.sh
 	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
-	cat symlist.p | $(SHELL) $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
+	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
 	rm -f symlist.p
 CLEANFILES += symlist.c
 BUILT_SOURCES += symlist.c
@@ -320,12 +270,12 @@ grub_emu-grub_emu_init.$(OBJEXT):grub_emu_init.h
 kern/emu/grub_emu_dyn-main.$(OBJEXT):grub_emu_init.h
 grub_emu_dyn-grub_emu_init.$(OBJEXT):grub_emu_init.h

-grub_emu_init.h: genemuinitheader.sh $(MODULE_FILES)
-	rm -f $@; echo $(MODULE_FILES) | sh $(srcdir)/genemuinitheader.sh $(TARGET_NM) > $@
+grub_emu_init.h: genemuinitheader.sh $(MOD_FILES)
+	rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinitheader.sh $(TARGET_NM) > $@
 CLEANFILES += grub_emu_init.h

-grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MODULE_FILES)
-	rm -f $@; echo $(MODULE_FILES) | sh $(srcdir)/genemuinit.sh $(TARGET_NM) > $@
+grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MOD_FILES)
+	rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinit.sh $(TARGET_NM) > $@
 CLEANFILES += grub_emu_init.c
 endif

@@ -372,16 +322,6 @@ terminal.lst: $(MARKER_FILES)
 platform_DATA += terminal.lst
 CLEANFILES += terminal.lst

-fdt.lst: $(MARKER_FILES)
-	(for pp in $^; do \
-	  b=`basename $$pp .marker`; \
-	  sed -n \
-	    -e "/FDT_DRIVER_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/i\1: $$b/;p;}" \
-	    -e "/FDT_DRIVER_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/o\1: $$b/;p;}" $$pp; \
-	done) | sort -u > $@
-platform_DATA += fdt.lst
-CLEANFILES += fdt.lst
-
 parttool.lst: $(MARKER_FILES)
 	(for pp in $^; do \
 	  b=`basename $$pp .marker`; \
@@ -420,7 +360,7 @@ moddep.lst: syminfo.lst genmoddep.awk video.lst
 platform_DATA += moddep.lst
 CLEANFILES += config.log syminfo.lst moddep.lst

-$(MOD_FILES): %.mod : genmod.sh moddep.lst %.module$(EXEEXT) build-grub-module-verifier$(BUILD_EXEEXT)
+$(MOD_FILES): %.mod : genmod.sh moddep.lst %.module$(EXEEXT)
 	TARGET_OBJ2ELF=@TARGET_OBJ2ELF@ sh $^ $@
 platform_DATA += $(MOD_FILES)
 platform_DATA += modinfo.sh
@@ -428,44 +368,43 @@ CLEANFILES += $(MOD_FILES)

 if COND_ENABLE_EFIEMU
 efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
-	-rm -f $@
-	-rm -f $@.bin
-	$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m32 -Wall -Werror -nostdlib -static -O2 -c -o $@.bin $<
-	if test "x$(TARGET_APPLE_LINKER)" = x1; then \
-	  $(TARGET_OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \
-	  rm -f $@.bin ; \
-	elif test ! -z "$(TARGET_OBJ2ELF)"; then \
-	  $(TARGET_OBJ2ELF) $@.bin || (rm -f $@.bin; exit 1); \
-	  mv $@.bin $@ ; \
-	else \
-	  mv $@.bin $@ ; \
-	fi
-
-# Link format -arch,x86_64 means Apple linker
-efiemu64_c.o: efiemu/runtime/efiemu.c
-	$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
-
-efiemu64_s.o: efiemu/runtime/efiemu.S
-	$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
-
-efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
-	-rm -f $@
-	-rm -f $@.bin
-	$(TARGET_CC) -m64 $(EFIEMU64_LINK_FORMAT) -nostdlib -static -Wl,-r -o $@.bin $^
-	if test "x$(EFIEMU64_LINK_FORMAT)" = x-arch,x86_64; then \
-	  $(TARGET_OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
+	-rm -f $@; \
+	if test "x$(TARGET_APPLE_CC)" = x1; then \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF32 -DAPPLE_CC -m32 -Wall -Werror -nostdlib -O2 -c -o $@.bin $< || exit 1; \
+	  $(OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \
 	  rm -f $@.bin; \
 	else \
-	  mv $@.bin $@ ; \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF32 -m32 -Wall -Werror -nostdlib -O2 -c -o $@ $< || exit 1; \
+	  if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
+	fi
+
+efiemu64_c.o: efiemu/runtime/efiemu.c
+	if test "x$(TARGET_APPLE_CC)" = x1; then \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -DAPPLE_CC=1 -m64 -nostdlib -Wall -Werror -mno-red-zone -c -o $@ $< || exit 1; \
+	else \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
+	fi
+
+efiemu64_s.o: efiemu/runtime/efiemu.S
+	-rm -f $@
+	if test "x$(TARGET_APPLE_CC)" = x1; then \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -DAPPLE_CC=1 -m64 -Wall -Werror -nostdlib -O2 -mno-red-zone -c -o $@ $< || exit 1; \
+	else \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
+	fi
+
+efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
+	-rm -f $@; \
+	if test "x$(TARGET_APPLE_CC)" = x1; then \
+	  rm -f $@.bin; \
+	  $(TARGET_CC) -m64 -Wl,-r -nostdlib -o $@.bin $^ || exit 1; \
+	  $(OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
+	  rm -f $@.bin; \
+	else \
+	  $(TARGET_CC) -m64 -nostdlib -Wl,-r -o $@ $^ || exit 1; \
+	  if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
 	fi

 platform_DATA += efiemu32.o efiemu64.o
 CLEANFILES += efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o
 endif
-
-windowsdir=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows
-windowsdir: $(PROGRAMS) $(starfield_DATA) $(platform_DATA)
-	test -d $(windowsdir)/$(target_cpu)-$(platform) || mkdir $(windowsdir)/$(target_cpu)-$(platform)
-	for x in $(platform_DATA); do \
-		cp -fp $$x $(windowsdir)/$(target_cpu)-$(platform)/$$x; \
-	done
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1,43 +1,43 @@
 AutoGen definitions Makefile.tpl;

-transform_data = {
+script = {
  installdir = noinst;
  name = gensyminfo.sh;
  common = gensyminfo.sh.in;
 };

-transform_data = {
+script = {
  installdir = noinst;
  name = genmod.sh;
  common = genmod.sh.in;
 };

-transform_data = {
+script = {
  installdir = noinst;
  name = modinfo.sh;
  common = modinfo.sh.in;
 };

-transform_data = {
+script = {
  installdir = platform;
  name = gmodule.pl;
  common = gmodule.pl.in;
 };

-transform_data = {
+script = {
  installdir = platform;
  name = gdb_grub;
  common = gdb_grub.in;
 };

-transform_data = {
+script = {
  installdir = platform;
  name = grub.chrp;
  common = boot/powerpc/grub.chrp.in;
  enable = powerpc_ieee1275;
 };

-transform_data = {
+script = {
  installdir = platform;
  name = bootinfo.txt;
  common = boot/powerpc/bootinfo.txt.in;
@@ -62,24 +62,17 @@ kernel = {
  arm_efi_ldflags          = '-Wl,-r,-d';
  arm_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';

-  arm64_efi_ldflags          = '-Wl,-r,-d';
-  arm64_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version -R .eh_frame';
-
  i386_pc_ldflags          = '$(TARGET_IMG_LDFLAGS)';
  i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),0x9000';
+
  i386_qemu_ldflags        = '$(TARGET_IMG_LDFLAGS)';
  i386_qemu_ldflags        = '$(TARGET_IMG_BASE_LDOPT),0x8200';
-  i386_coreboot_ldflags    = '$(TARGET_IMG_LDFLAGS)';
-  i386_coreboot_ldflags    = '$(TARGET_IMG_BASE_LDOPT),0x8200';
-  i386_multiboot_ldflags   = '$(TARGET_IMG_LDFLAGS)';
-  i386_multiboot_ldflags   = '$(TARGET_IMG_BASE_LDOPT),0x8200';
-  i386_ieee1275_ldflags    = '$(TARGET_IMG_LDFLAGS)';
-  i386_ieee1275_ldflags    = '$(TARGET_IMG_BASE_LDOPT),0x10000';
-  i386_xen_ldflags         = '$(TARGET_IMG_LDFLAGS)';
-  i386_xen_ldflags         = '$(TARGET_IMG_BASE_LDOPT),0';
-  x86_64_xen_ldflags       = '$(TARGET_IMG_LDFLAGS)';
-  x86_64_xen_ldflags       = '$(TARGET_IMG_BASE_LDOPT),0';

+  ldadd = '$(LDADD_KERNEL)';
+
+  i386_coreboot_ldflags    = '-Wl,-Ttext=0x8200';
+  i386_multiboot_ldflags   = '-Wl,-Ttext=0x8200';
+  i386_ieee1275_ldflags    = '-Wl,-Ttext=0x10000';
  mips_loongson_ldflags    = '-Wl,-Ttext,0x80200000';
  powerpc_ieee1275_ldflags = '-Wl,-Ttext,0x200000';
  sparc64_ieee1275_ldflags = '-Wl,-Ttext,0x4400';
@@ -87,19 +80,16 @@ kernel = {
  mips_qemu_mips_ldflags    = '-Wl,-Ttext,0x80200000';

  mips_arc_cppflags = '-DGRUB_DECOMPRESSOR_LINK_ADDR=$(TARGET_DECOMPRESSOR_LINK_ADDR)';
+  mips_loongson_cppflags = '-DUSE_ASCII_FALLBACK';
  i386_qemu_cppflags     = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
  emu_cflags = '$(CFLAGS_GNULIB)';
  emu_cppflags = '$(CPPFLAGS_GNULIB)';
-  arm_uboot_ldflags       = '-Wl,-r,-d';
+  arm_uboot_ldflags       = '-Wl,-Ttext=0x08000000';
  arm_uboot_stripflags    = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
-  arm_coreboot_ldflags       = '-Wl,-r,-d';
-  arm_coreboot_stripflags    = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';

  i386_pc_startup = kern/i386/pc/startup.S;
  i386_efi_startup = kern/i386/efi/startup.S;
  x86_64_efi_startup = kern/x86_64/efi/startup.S;
-  i386_xen_startup = kern/i386/xen/startup.S;
-  x86_64_xen_startup = kern/x86_64/xen/startup.S;
  i386_qemu_startup = kern/i386/qemu/startup.S;
  i386_ieee1275_startup = kern/i386/ieee1275/startup.S;
  i386_coreboot_startup = kern/i386/coreboot/startup.S;
@@ -107,10 +97,8 @@ kernel = {
  mips_startup = kern/mips/startup.S;
  sparc64_ieee1275_startup = kern/sparc64/ieee1275/crt0.S;
  powerpc_ieee1275_startup = kern/powerpc/ieee1275/startup.S;
-  arm_uboot_startup = kern/arm/startup.S;
-  arm_coreboot_startup = kern/arm/startup.S;
+  arm_uboot_startup = kern/arm/uboot/startup.S;
  arm_efi_startup = kern/arm/efi/startup.S;
-  arm64_efi_startup = kern/arm64/efi/startup.S;

  common = kern/command.c;
  common = kern/corecmd.c;
@@ -130,7 +118,6 @@ kernel = {
  common = kern/rescue_reader.c;
  common = kern/term.c;

-  noemu = kern/compiler-rt.c;
  noemu = kern/mm.c;
  noemu = kern/time.c;
  noemu = kern/generic/millisleep.c;
@@ -152,88 +139,43 @@ kernel = {
  uboot = kern/uboot/init.c;
  uboot = kern/uboot/hw.c;
  uboot = term/uboot/console.c;
-  arm_uboot = kern/arm/uboot/init.c;
-  arm_uboot = kern/arm/uboot/uboot.S;
-
-  arm_coreboot = kern/arm/coreboot/init.c;
-  arm_coreboot = kern/arm/coreboot/timer.c;
-  arm_coreboot = kern/arm/coreboot/coreboot.S;
-  arm_coreboot = lib/fdt.c;
-  arm_coreboot = bus/fdt.c;
-  arm_coreboot = term/ps2.c;
-  arm_coreboot = term/arm/pl050.c;
-  arm_coreboot = term/arm/cros.c;
-  arm_coreboot = term/arm/cros_ec.c;
-  arm_coreboot = bus/spi/rk3288_spi.c;
-  arm_coreboot = commands/keylayouts.c;
-  arm_coreboot = kern/arm/coreboot/dma.c;

  terminfoinkernel = term/terminfo.c;
  terminfoinkernel = term/tparm.c;
  terminfoinkernel = commands/extcmd.c;
  terminfoinkernel = lib/arg.c;

-  softdiv = lib/division.c;
-
  i386 = kern/i386/dl.c;
-  i386_xen = kern/i386/dl.c;

  i386_coreboot = kern/i386/coreboot/init.c;
  i386_multiboot = kern/i386/coreboot/init.c;
  i386_qemu = kern/i386/qemu/init.c;
  i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c;
-  coreboot = video/coreboot/cbfb.c;
+  i386_coreboot = video/i386/coreboot/cbfb.c;

  efi = disk/efi/efidisk.c;
  efi = kern/efi/efi.c;
  efi = kern/efi/init.c;
  efi = kern/efi/mm.c;
  efi = term/efi/console.c;
-  efi = kern/acpi.c;
-  efi = kern/efi/acpi.c;
-  i386_coreboot = kern/i386/pc/acpi.c;
-  i386_multiboot = kern/i386/pc/acpi.c;
-  i386_coreboot = kern/acpi.c;
-  i386_multiboot = kern/acpi.c;

  x86 = kern/i386/tsc.c;
-  x86 = kern/i386/tsc_pit.c;
-  i386_efi = kern/i386/efi/tsc.c;
-  x86_64_efi = kern/i386/efi/tsc.c;
-  i386_efi = kern/i386/tsc_pmtimer.c;
-  i386_coreboot = kern/i386/tsc_pmtimer.c;
-  x86_64_efi = kern/i386/tsc_pmtimer.c;

  i386_efi = kern/i386/efi/init.c;
  i386_efi = bus/pci.c;

-  x86_64 = kern/x86_64/dl.c;
-  x86_64_xen = kern/x86_64/dl.c;
+  x86_64_efi = kern/x86_64/dl.c;
  x86_64_efi = kern/x86_64/efi/callwrap.S;
  x86_64_efi = kern/i386/efi/init.c;
  x86_64_efi = bus/pci.c;

-  xen = kern/i386/tsc.c;
-  xen = kern/i386/xen/tsc.c;
-  x86_64_xen = kern/x86_64/xen/hypercall.S;
-  i386_xen = kern/i386/xen/hypercall.S;
-  xen = kern/xen/init.c;
-  xen = term/xen/console.c;
-  xen = disk/xen/xendisk.c;
-  xen = commands/boot.c;
-
  ia64_efi = kern/ia64/efi/startup.S;
  ia64_efi = kern/ia64/efi/init.c;
  ia64_efi = kern/ia64/dl.c;
  ia64_efi = kern/ia64/dl_helper.c;
-  ia64_efi = kern/ia64/cache.c;

  arm_efi = kern/arm/efi/init.c;
  arm_efi = kern/arm/efi/misc.c;
-  arm_efi = kern/efi/fdt.c;
-
-  arm64_efi = kern/arm64/efi/init.c;
-  arm64_efi = kern/efi/fdt.c;

  i386_pc = kern/i386/pc/init.c;
  i386_pc = kern/i386/pc/mmap.c;
@@ -243,10 +185,8 @@ kernel = {
  i386_qemu = kern/vga_init.c;
  i386_qemu = kern/i386/qemu/mmap.c;

-  coreboot = kern/coreboot/mmap.c;
+  i386_coreboot = kern/i386/coreboot/mmap.c;
  i386_coreboot = kern/i386/coreboot/cbtable.c;
-  coreboot = kern/coreboot/cbtable.c;
-  arm_coreboot = kern/arm/coreboot/cbtable.c;

  i386_multiboot = kern/i386/multiboot_mmap.c;

@@ -258,7 +198,6 @@ kernel = {
  mips_qemu_mips = term/ns8250.c;
  mips_qemu_mips = term/serial.c;
  mips_qemu_mips = term/at_keyboard.c;
-  mips_qemu_mips = term/ps2.c;
  mips_qemu_mips = commands/boot.c;
  mips_qemu_mips = commands/keylayouts.c;
  mips_qemu_mips = term/i386/pc/vga_text.c;
@@ -274,20 +213,17 @@ kernel = {
  mips_loongson = bus/pci.c;
  mips_loongson = kern/mips/loongson/init.c;
  mips_loongson = term/at_keyboard.c;
-  mips_loongson = term/ps2.c;
  mips_loongson = commands/boot.c;
  mips_loongson = term/serial.c;
  mips_loongson = video/sm712.c;
  mips_loongson = video/sis315pro.c;
  mips_loongson = video/radeon_fuloong2e.c;
-  mips_loongson = video/radeon_yeeloong3a.c;
  extra_dist = video/sm712_init.c;
  extra_dist = video/sis315_init.c;
  mips_loongson = commands/keylayouts.c;

  powerpc_ieee1275 = kern/powerpc/cache.S;
  powerpc_ieee1275 = kern/powerpc/dl.c;
-  powerpc_ieee1275 = kern/powerpc/compiler-rt.S;

  sparc64_ieee1275 = kern/sparc64/cache.S;
  sparc64_ieee1275 = kern/sparc64/dl.c;
@@ -299,12 +235,7 @@ kernel = {
  arm = kern/arm/cache_armv7.S;
  extra_dist = kern/arm/cache.S;
  arm = kern/arm/cache.c;
-  arm = kern/arm/compiler-rt.S;
-
-  arm64 = kern/arm64/cache.c;
-  arm64 = kern/arm64/cache_flush.S;
-  arm64 = kern/arm64/dl.c;
-  arm64 = kern/arm64/dl_helper.c;
+  arm = kern/arm/misc.S;

  emu = disk/host.c;
  emu = kern/emu/cache_s.S;
@@ -324,9 +255,6 @@ kernel = {
  emu = osdep/emuconsole.c;
  extra_dist = osdep/unix/emuconsole.c;
  extra_dist = osdep/windows/emuconsole.c;
-  emu = osdep/dl.c;
-  extra_dist = osdep/unix/dl.c;
-  extra_dist = osdep/windows/dl.c;
  emu = osdep/sleep.c;
  emu = osdep/init.c;
  emu = osdep/emunet.c;
@@ -477,13 +405,13 @@ image = {
  common = lib/xzembed/xz_dec_bcj.c;
  common = lib/xzembed/xz_dec_lzma2.c;
  common = lib/xzembed/xz_dec_stream.c;
-  common = kern/compiler-rt.c;

-  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed -DGRUB_EMBED_DECOMPRESSOR=1';
+  cppflags = '$(CPPFLAGS_POSIX) -I$(srcdir)/lib/xzembed -DGRUB_EMBED_DECOMPRESSOR=1';

  objcopyflags = '-O binary';
-  mips_ldflags = '-Wl,-Ttext,$(TARGET_DECOMPRESSOR_LINK_ADDR)';
-  cflags = '-Wno-unreachable-code';
+  mips_ldflags = '-static-libgcc -Wl,-Ttext,$(TARGET_DECOMPRESSOR_LINK_ADDR)';
+  ldadd = '-lgcc';
+  cflags = '-Wno-unreachable-code -static-libgcc';
  enable = mips;
 };

@@ -495,7 +423,9 @@ image = {
  cppflags = '-DGRUB_EMBED_DECOMPRESSOR=1';

  objcopyflags = '-O binary';
-  mips_ldflags = '-Wl,-Ttext,$(TARGET_DECOMPRESSOR_LINK_ADDR)';
+  mips_ldflags = '-static-libgcc -Wl,-Ttext,$(TARGET_DECOMPRESSOR_LINK_ADDR)';
+  ldadd = '-lgcc';
+  cflags = '-static-libgcc';
  enable = mips;
 };

@@ -513,7 +443,7 @@ image = {
  name = fwstart;
  mips_loongson = boot/mips/loongson/fwstart.S;
  objcopyflags = '-O binary';
-  ldflags = '-Wl,-N,-S,-Ttext,0xbfc00000,-Bstatic';
+  ldflags = '-static-libgcc -lgcc -Wl,-N,-S,-Ttext,0xbfc00000,-Bstatic';
  enable = mips_loongson;
 };

@@ -521,7 +451,7 @@ image = {
  name = fwstart_fuloong2f;
  mips_loongson = boot/mips/loongson/fuloong2f.S;
  objcopyflags = '-O binary';
-  ldflags = '-Wl,-N,-S,-Ttext,0xbfc00000,-Bstatic';
+  ldflags = '-static-libgcc -lgcc -Wl,-N,-S,-Ttext,0xbfc00000,-Bstatic';
  enable = mips_loongson;
 };

@@ -543,6 +473,13 @@ module = {
  enable = x86;
 };

+module = {
+  name = libusb;
+  emu = bus/usb/emu/usb.c;
+  enable = emu;
+  condition = COND_GRUB_EMU_USB;
+};
+
 module = {
  name = lsspd;
  mips_loongson = commands/mips/loongson/lsspd.c;
@@ -557,6 +494,12 @@ module = {
  enable = usb;
 };

+module = {
+  name = emuusb;
+  common = bus/usb/usb.c;
+  condition = COND_GRUB_EMU_USB;
+};
+
 module = {
  name = usbserial_common;
  common = bus/usb/serial/common.c;
@@ -596,16 +539,12 @@ module = {
 module = {
  name = ehci;
  common = bus/usb/ehci.c;
-  arm_coreboot = bus/usb/ehci-fdt.c;
-  pci = bus/usb/ehci-pci.c;
  enable = pci;
-  enable = arm_coreboot;
 };

 module = {
  name = pci;
  common = bus/pci.c;
-  i386_ieee1275 = bus/i386/ieee1275/pci.c;

  enable = i386_pc;
  enable = i386_ieee1275;
@@ -627,7 +566,6 @@ module = {
  common = bus/emu/pci.c;
  common = commands/lspci.c;

-  enable = emu;
  condition = COND_GRUB_EMU_PCI;
 };

@@ -638,11 +576,19 @@ module = {
  enable = mips_arc;
 };

-module = {
-  name = lsxen;
-  common = commands/xen/lsxen.c;
+library = {
+  name = libregexp.a;
+  common = gnulib/regex.c;
+  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB) -DGRUB_POSIX_GETTEXT_DOMAIN=\"grub\"';
+};

-  enable = xen;
+module = {
+  name = getopt;
+  common = gnulib/getopt.c;
+  common = gnulib/getopt1.c;
+  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB) -DGRUB_POSIX_GETTEXT_DOMAIN=\"grub\"';
 };

 module = {
@@ -666,7 +612,6 @@ module = {
 module = {
  name = cbtable;
  common = kern/i386/coreboot/cbtable.c;
-  common = kern/coreboot/cbtable.c;
  enable = i386_pc;
  enable = i386_efi;
  enable = i386_qemu;
@@ -697,7 +642,8 @@ module = {
  name = regexp;
  common = commands/regexp.c;
  common = commands/wildcard.c;
-  common = gnulib/regex.c;
+  ldadd = libregexp.a;
+  dependencies = libregexp.a;
  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
 };
@@ -706,8 +652,10 @@ module = {
  name = acpi;

  common = commands/acpi.c;
-  i386_pc = kern/acpi.c;
-  i386_pc = kern/i386/pc/acpi.c;
+  efi = commands/efi/acpi.c;
+  i386_pc = commands/i386/pc/acpi.c;
+  i386_coreboot = commands/i386/pc/acpi.c;
+  i386_multiboot = commands/i386/pc/acpi.c;

  enable = efi;
  enable = i386_pc;
@@ -778,9 +726,7 @@ module = {
  enable = mips_arc;
  enable = ia64_efi;
  enable = arm_efi;
-  enable = arm64_efi;
  enable = arm_uboot;
-  enable = arm_coreboot;
 };

 module = {
@@ -800,10 +746,8 @@ module = {

 module = {
  name = cpuid;
-  common = commands/i386/cpuid.c;
+  x86 = commands/i386/cpuid.c;
  enable = x86;
-  enable = i386_xen;
-  enable = x86_64_xen;
 };

 module = {
@@ -860,12 +804,10 @@ module = {
  i386_multiboot = lib/i386/halt.c;
  i386_coreboot = lib/i386/halt.c;
  i386_qemu = lib/i386/halt.c;
-  xen = lib/xen/halt.c;
  efi = lib/efi/halt.c;
  ieee1275 = lib/ieee1275/halt.c;
  emu = lib/emu/halt.c;
-  uboot = lib/dummy/halt.c;
-  arm_coreboot = lib/dummy/halt.c;
+  uboot = lib/uboot/halt.c;
 };

 module = {
@@ -875,15 +817,12 @@ module = {
  ia64_efi = lib/efi/reboot.c;
  x86_64_efi = lib/efi/reboot.c;
  arm_efi = lib/efi/reboot.c;
-  arm64_efi = lib/efi/reboot.c;
  powerpc_ieee1275 = lib/ieee1275/reboot.c;
  sparc64_ieee1275 = lib/ieee1275/reboot.c;
  mips_arc = lib/mips/arc/reboot.c;
  mips_loongson = lib/mips/loongson/reboot.c;
  mips_qemu_mips = lib/mips/qemu_mips/reboot.c;
-  xen = lib/xen/reboot.c;
  uboot = lib/uboot/reboot.c;
-  arm_coreboot = lib/dummy/reboot.c;
  common = commands/reboot.c;
 };

@@ -896,12 +835,7 @@ module = {
  name = verify;
  common = commands/verify.c;
  cflags = '$(CFLAGS_POSIX)';
-  cppflags = '-I$(srcdir)/lib/posix_wrap';
-};
-
-module = {
-  name = verify_helper;
-  common = commands/verify_helper.c;
+  cppflags = '-I$(srcdir)/lib/posix_wrap/include';
 };

 module = {
@@ -1276,7 +1210,7 @@ module = {
  common = fs/btrfs.c;
  common = lib/crc.c;
  cflags = '$(CFLAGS_POSIX) -Wno-undef';
-  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/minilzo -DMINILZO_HAVE_CONFIG_H';
+  cppflags = '$(CPPFLAGS_POSIX) -I$(srcdir)/lib/minilzo -DMINILZO_HAVE_CONFIG_H';
 };

 module = {
@@ -1418,7 +1352,7 @@ module = {
  name = squash4;
  common = fs/squash4.c;
  cflags = '$(CFLAGS_POSIX) -Wno-undef';
-  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed -I$(srcdir)/lib/minilzo -DMINILZO_HAVE_CONFIG_H';
+  cppflags = '$(CPPFLAGS_POSIX) -I$(srcdir)/lib/xzembed -I$(srcdir)/lib/minilzo -DMINILZO_HAVE_CONFIG_H';
 };

 module = {
@@ -1470,11 +1404,6 @@ module = {
  common = fs/zfs/zfsinfo.c;
 };

-module = {
-  name = macbless;
-  common = commands/macbless.c;
-};
-
 module = {
  name = pxe;
  i386_pc = net/drivers/i386/pc/pxe.c;
@@ -1489,6 +1418,7 @@ module = {
 module = {
  name = gfxmenu;
  common = gfxmenu/gfxmenu.c;
+  common = gfxmenu/model.c;
  common = gfxmenu/view.c;
  common = gfxmenu/font.c;
  common = gfxmenu/icon_manager.c;
@@ -1515,11 +1445,6 @@ module = {
  common = io/gzio.c;
 };

-module = {
-  name = offsetio;
-  common = io/offset.c;
-};
-
 module = {
  name = bufio;
  common = io/bufio.c;
@@ -1553,21 +1478,13 @@ module = {
  x86 = lib/i386/relocator64.S;
  i386 = lib/i386/relocator_asm.S;
  x86_64 = lib/x86_64/relocator_asm.S;
-  i386_xen = lib/i386/relocator_asm.S;
-  x86_64_xen = lib/x86_64/relocator_asm.S;
  x86 = lib/i386/relocator.c;
-  x86 = lib/i386/relocator_common_c.c;
  ieee1275 = lib/ieee1275/relocator.c;
  efi = lib/efi/relocator.c;
  mips = lib/mips/relocator_asm.S;
  mips = lib/mips/relocator.c;
  powerpc = lib/powerpc/relocator_asm.S;
  powerpc = lib/powerpc/relocator.c;
-  xen = lib/xen/relocator.c;
-  i386_xen = lib/i386/xen/relocator.S;
-  x86_64_xen = lib/x86_64/xen/relocator.S;
-  xen = lib/i386/relocator_common_c.c;
-  x86_64_efi = lib/x86_64/efi/relocator.c;

  extra_dist = lib/i386/relocator_common.S;
  extra_dist = kern/powerpc/cache_flush.S;
@@ -1575,20 +1492,17 @@ module = {
  enable = mips;
  enable = powerpc;
  enable = x86;
-  enable = xen;
 };

 module = {
  name = datetime;
  cmos = lib/cmos_datetime.c;
  efi = lib/efi/datetime.c;
-  uboot = lib/dummy/datetime.c;
-  arm_coreboot = lib/dummy/datetime.c;
+  uboot = lib/uboot/datetime.c;
  sparc64_ieee1275 = lib/ieee1275/datetime.c;
  powerpc_ieee1275 = lib/ieee1275/datetime.c;
  sparc64_ieee1275 = lib/ieee1275/cmos.c;
  powerpc_ieee1275 = lib/ieee1275/cmos.c;
-  xen = lib/xen/datetime.c;

  mips_arc = lib/arc/datetime.c;
  enable = noemu;
@@ -1605,7 +1519,6 @@ module = {
  extra_dist = lib/ia64/setjmp.S;
  extra_dist = lib/ia64/longjmp.S;
  extra_dist = lib/arm/setjmp.S;
-  extra_dist = lib/arm64/setjmp.S;
 };

 module = {
@@ -1647,14 +1560,6 @@ module = {
  enable = i386_pc;
 };

-
-module = {
-  name = truecrypt;
-  i386_pc = loader/i386/pc/truecrypt.c;
-  enable = i386_pc;
-};
-
-
 module = {
  name = freedos;
  i386_pc = loader/i386/pc/freedos.c;
@@ -1672,7 +1577,6 @@ module = {
  cppflags = "-DGRUB_USE_MULTIBOOT2";

  common = loader/multiboot.c;
-  common = lib/cmdline.c;
  common = loader/multiboot_mbi2.c;
  enable = x86;
  enable = mips;
@@ -1681,84 +1585,38 @@ module = {
 module = {
  name = multiboot;
  common = loader/multiboot.c;
-  common = lib/cmdline.c;
  x86 = loader/i386/multiboot_mbi.c;
  extra_dist = loader/multiboot_elfxx.c;
  enable = x86;
 };

-module = {
-  name = xen_boot;
-  common = lib/cmdline.c;
-  arm64 = loader/arm64/xen_boot.c;
-  enable = arm64;
-};
-
 module = {
  name = linux;
  x86 = loader/i386/linux.c;
-  xen = loader/i386/xen.c;
  i386_pc = lib/i386/pc/vesa_modes_table.c;
  mips = loader/mips/linux.c;
  powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c;
  sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c;
  ia64_efi = loader/ia64/efi/linux.c;
  arm = loader/arm/linux.c;
-  arm64 = loader/arm64/linux.c;
+  arm = lib/fdt.c;
  common = loader/linux.c;
  common = lib/cmdline.c;
  enable = noemu;
 };

-module = {
-  name = fdt;
-  arm64 = loader/arm64/fdt.c;
-  common = lib/fdt.c;
-  enable = fdt;
-};
-
 module = {
  name = xnu;
  x86 = loader/xnu_resume.c;
  x86 = loader/i386/xnu.c;
+  x86 = loader/macho32.c;
+  x86 = loader/macho64.c;
+  x86 = loader/macho.c;
  x86 = loader/xnu.c;
+  x86 = loader/lzss.c;

-  /* Code is pretty generic but relies on RNG which
-     is available only on few platforms. It's not a
-     big deal as xnu needs ACPI anyway and we have
-     RNG on all platforms with ACPI.
-   */
-  enable = i386_multiboot;
-  enable = i386_coreboot;
-  enable = i386_pc;
-  enable = i386_efi;
-  enable = x86_64_efi;
-};
-
-module = {
-  name = random;
-  x86 = lib/i386/random.c;
-  common = lib/random.c;
-
-  i386_multiboot = kern/i386/tsc_pmtimer.c;
-  i386_coreboot = kern/i386/tsc_pmtimer.c;
-  i386_pc = kern/i386/tsc_pmtimer.c;
-
-  enable = i386_multiboot;
-  enable = i386_coreboot;
-  enable = i386_pc;
-  enable = i386_efi;
-  enable = x86_64_efi;
-};
-
-module = {
-  name = macho;
-
-  common = loader/macho.c;
-  common = loader/macho32.c;
-  common = loader/macho64.c;
-  common = loader/lzss.c;
  extra_dist = loader/machoXX.c;
+  enable = x86;
 };

 module = {
@@ -1773,7 +1631,6 @@ module = {
  efi = loader/efi/chainloader.c;
  i386_pc = loader/i386/pc/chainloader.c;
  i386_coreboot = loader/i386/coreboot/chainloader.c;
-  i386_coreboot = lib/LzmaDec.c;
  enable = i386_pc;
  enable = i386_coreboot;
  enable = efi;
@@ -1795,7 +1652,6 @@ module = {
  enable = x86;
  enable = ia64_efi;
  enable = arm_efi;
-  enable = arm64_efi;
  enable = mips;
 };

@@ -1817,7 +1673,6 @@ module = {
  common = normal/term.c;
  common = normal/context.c;
  common = normal/charset.c;
-  common = lib/getline.c;

  common = script/main.c;
  common = script/script.c;
@@ -1904,7 +1759,6 @@ module = {
 module = {
  name = at_keyboard;
  common = term/at_keyboard.c;
-  common = term/ps2.c;
  enable = x86;
 };

@@ -1997,83 +1851,11 @@ module = {
  common = tests/example_functional_test.c;
 };

-module = {
-  name = strtoull_test;
-  common = tests/strtoull_test.c;
-};
-
 module = {
  name = setjmp_test;
  common = tests/setjmp_test.c;
 };

-module = {
-  name = signature_test;
-  common = tests/signature_test.c;
-  common = tests/signatures.h;
-};
-
-module = {
-  name = sleep_test;
-  common = tests/sleep_test.c;
-};
-
-module = {
-  name = xnu_uuid_test;
-  common = tests/xnu_uuid_test.c;
-};
-
-module = {
-  name = pbkdf2_test;
-  common = tests/pbkdf2_test.c;
-};
-
-module = {
-  name = legacy_password_test;
-  common = tests/legacy_password_test.c;
-  enable = i386_pc;
-  enable = i386_efi;
-  enable = x86_64_efi;
-  enable = emu;
-  enable = xen;
-};
-
-module = {
-  name = div;
-  common = lib/division.c;
-  enable = no_softdiv;
-};
-
-module = {
-  name = div_test;
-  common = tests/div_test.c;
-};
-
-module = {
-  name = mul_test;
-  common = tests/mul_test.c;
-};
-
-module = {
-  name = shift_test;
-  common = tests/shift_test.c;
-};
-
-module = {
-  name = cmp_test;
-  common = tests/cmp_test.c;
-};
-
-module = {
-  name = ctz_test;
-  common = tests/ctz_test.c;
-};
-
-module = {
-  name = bswap_test;
-  common = tests/bswap_test.c;
-};
-
 module = {
  name = videotest_checksum;
  common = tests/videotest_checksum.c;
@@ -2227,19 +2009,11 @@ module = {
  emu = lib/i386/pc/vesa_modes_table.c;
  i386_efi = lib/i386/pc/vesa_modes_table.c;
  x86_64_efi = lib/i386/pc/vesa_modes_table.c;
-  xen = lib/i386/pc/vesa_modes_table.c;

  enable = i386_pc;
  enable = i386_efi;
  enable = x86_64_efi;
  enable = emu;
-  enable = xen;
-};
-
-module = {
-  name = syslinuxcfg;
-  common = lib/syslinux_parse.c;
-  common = commands/syslinuxcfg.c;
 };

 module = {
@@ -2253,7 +2027,7 @@ module = {
  common = lib/xzembed/xz_dec_bcj.c;
  common = lib/xzembed/xz_dec_lzma2.c;
  common = lib/xzembed/xz_dec_stream.c;
-  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed';
+  cppflags = '$(CPPFLAGS_POSIX) -I$(srcdir)/lib/xzembed';
  cflags='-Wno-unreachable-code';
 };

@@ -2262,7 +2036,7 @@ module = {
  common = io/lzopio.c;
  common = lib/minilzo/minilzo.c;
  cflags = '$(CFLAGS_POSIX) -Wno-undef -Wno-redundant-decls -Wno-error';
-  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/minilzo -DMINILZO_HAVE_CONFIG_H';
+  cppflags = '$(CPPFLAGS_POSIX) -I$(srcdir)/lib/minilzo -DMINILZO_HAVE_CONFIG_H';
 };

 module = {
@@ -2273,12 +2047,8 @@ module = {
 module = {
  name = backtrace;
  x86 = lib/i386/backtrace.c;
-  i386_xen = lib/i386/backtrace.c;
-  x86_64_xen = lib/i386/backtrace.c;
  common = lib/backtrace.c;
  enable = x86;
-  enable = i386_xen;
-  enable = x86_64_xen;
 };

 module = {
@@ -2293,6 +2063,87 @@ module = {
  enable = x86;
 };

+module = {
+  name = braille_baum;
+  common = braille/brltty/Drivers/Braille/Baum/braille.c;
+  cflags = '$(CFLAGS_POSIX) $(CFLAGS_BRAILLE)';
+  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_BRAILLE) -DDRIVER_NAME=Baum -DDRIVER_CODE=1 -DDRIVER_COMMENT=\"\" -DDRIVER_VERSION=\"\" -DDRIVER_DEVELOPERS=\"\" -DGRUB_POSIX_GETTEXT_DOMAIN=\"brltty\"';
+};
+
+module = {
+  name = braille_core;
+  common = braille/brltty/Programs/atb_compile.c;
+  common = braille/brltty/Programs/atb_translate.c;
+  common = braille/brltty/Programs/brl.c;
+  common = braille/brltty/Programs/brltty.c;
+  common = braille/brltty/Programs/bluetooth_none.c;
+  common = braille/brltty/Programs/bluetooth.c;
+  common = braille/brltty/Programs/clipboard.c;
+  common = braille/brltty/Programs/config.c;
+  common = braille/brltty/Programs/ctb_translate.c;
+  common = braille/brltty/Programs/dataarea.c;
+  common = braille/brltty/Programs/device.c;
+  common = braille/brltty/Programs/driver.c;
+  common = braille/brltty/Programs/drivers.c;
+  common = braille/brltty/Programs/menu.c;
+  common = braille/brltty/Programs/parse.c;
+  common = braille/brltty/Programs/queue.c;
+  common = braille/brltty/Programs/routing.c;
+  common = braille/brltty/Programs/scancodes.c;
+  common = braille/brltty/Programs/scr_frozen.c;
+  common = braille/brltty/Programs/ses.c;
+  common = braille/brltty/Programs/scr.c;
+  common = braille/brltty/Programs/ttb_translate.c;
+  common = braille/brltty/Programs/tunes.c;
+  common = braille/brltty/Programs/usb.c;
+  common = braille/brltty/Programs/usb_serial.c;
+  common = braille/brltty/Programs/usb_hid.c;
+
+  common = braille/brltty/Programs/async.c;
+  common = braille/brltty/Programs/auth.c;
+  common = braille/brltty/Programs/charset.c;
+  common = braille/brltty/Programs/charset_grub.c;
+  common = braille/brltty/Programs/cmd.c;
+  common = braille/brltty/Programs/ctb_compile.c;
+  common = braille/brltty/Programs/datafile.c;
+  common = braille/brltty/Programs/file.c;
+  common = braille/brltty/Programs/hostcmd.c; 
+  common = braille/brltty/Programs/hostcmd_none.c; 
+  common = braille/brltty/Programs/io_misc.c;
+  common = braille/brltty/Programs/kbd.c;
+  common = braille/brltty/Programs/kbd_none.c;
+  common = braille/brltty/Programs/ktb_compile.c;
+  common = braille/brltty/Programs/ktb_translate.c;
+  common = braille/brltty/Programs/ktb_list.c;
+  common = braille/brltty/Programs/ktb_keyboard.c;
+  common = braille/brltty/Programs/lock.c;
+  common = braille/brltty/Programs/log.c;
+  common = braille/brltty/Programs/main.c;
+/*  common = braille/brltty/Programs/mount.c; */
+  common = braille/brltty/Programs/options.c;
+  common = braille/brltty/Programs/prefs.c;
+  common = braille/brltty/Programs/program.c;
+  common = braille/brltty/Programs/scr_base.c;
+  common = braille/brltty/Programs/scr_help.c;
+  common = braille/brltty/Programs/scr_main.c;
+  common = braille/brltty/Programs/scr_menu.c;
+/*  common = braille/brltty/Programs/scr_real.c; */
+/*  common = braille/brltty/Programs/serial.c; */
+  common = braille/brltty/Programs/status.c;
+  common = braille/brltty/Programs/sys_grub.c;
+  common = braille/brltty/Programs/timing.c;
+  common = braille/brltty/Programs/touch.c;
+  common = braille/brltty/Programs/ttb_compile.c;
+  common = braille/brltty/Programs/ttb_native.c;
+  common = braille/brltty/Programs/unicode.c;
+
+/*  common = braille/brltty_wrap/charset.c; */
+  common = braille/brltty_wrap/usb.c;
+  common = braille/brltty_wrap/serial.c;
+  cflags = '$(CFLAGS_POSIX) $(CFLAGS_BRAILLE)';
+  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_BRAILLE) -DGRUB_POSIX_GETTEXT_DOMAIN=\"brltty\"';
+};
+
 module = {
  name = priority_queue;
  common = lib/priority_queue.c;
@@ -2370,6 +2221,24 @@ module = {
  enable = i386;
 };

+module = {
+  name = posix;
+  common = lib/posix_wrap/errno.c;
+  common = lib/posix_wrap/stdio.c;
+  common = lib/posix_wrap/string.c;
+  common = lib/posix_wrap/time.c;
+};
+
+module = {
+  name = bsearch;
+  common = lib/bsearch.c;
+};
+
+module = {
+  name = qsort;
+  common = lib/qsort.c;
+};
+
 module = {
  name = testspeed;
  common = commands/testspeed.c;
@@ -2384,15 +2253,3 @@ module = {
  name = progress;
  common = lib/progress.c;
 };
-
-module = {
-  name = file;
-  common = commands/file.c;
-  common = commands/file32.c;
-  common = commands/file64.c;
-  extra_dist = commands/fileXX.c;
-  common = loader/i386/xen_file.c;
-  common = loader/i386/xen_file32.c;
-  common = loader/i386/xen_file64.c;
-  extra_dist = loader/i386/xen_fileXX.c;
-};
--- a/grub-core/boot/decompressor/minilib.c
+++ b/grub-core/boot/decompressor/minilib.c
@@ -21,7 +21,7 @@
 #include <grub/decompressor.h>

 void *
-grub_memset (void *s, int c, grub_size_t len)
+memset (void *s, int c, grub_size_t len)
 {
  grub_uint8_t *ptr;
  for (ptr = s; len; ptr++, len--)
@@ -68,6 +68,15 @@ grub_memcmp (const void *s1, const void *s2, grub_size_t n)
  return 0;
 }

+int memcmp (const void *s1, const void *s2, grub_size_t n)
+  __attribute__ ((alias ("grub_memcmp")));
+
+void *memmove (void *dest, const void *src, grub_size_t n)
+  __attribute__ ((alias ("grub_memmove")));
+
+void *memcpy (void *dest, const void *src, grub_size_t n)
+  __attribute__ ((alias ("grub_memmove")));
+
 void *grub_decompressor_scratch;

 void
--- a/grub-core/boot/i386/pc/boot.S
+++ b/grub-core/boot/i386/pc/boot.S
@@ -31,32 +31,27 @@
 	.macro floppy
 part_start:

-LOCAL(probe_values):
+probe_values:
 	.byte	36, 18, 15, 9, 0

 LOCAL(floppy_probe):
-	pushw	%dx
 /*
 *  Perform floppy probe.
 */
-#ifdef __APPLE__
-	LOCAL(probe_values_minus_one) = LOCAL(probe_values) - 1
-	movw	MACRO_DOLLAR(LOCAL(probe_values_minus_one)), %si
-#else
-	movw	MACRO_DOLLAR(LOCAL(probe_values)) - 1, %si
-#endif
+
+	movw	$probe_values - 1, %si

 LOCAL(probe_loop):
 	/* reset floppy controller INT 13h AH=0 */
 	xorw	%ax, %ax
-	int	MACRO_DOLLAR(0x13)
+	int	$0x13

 	incw	%si
 	movb	(%si), %cl

 	/* if number of sectors is 0, display error and die */
-	testb	%cl, %cl
-	jnz	1f
+	cmpb	$0, %cl
+	jne	1f

 /*
 * Floppy disk probe failure.
@@ -69,20 +64,20 @@ fd_probe_error_string:	.asciz "Floppy"

 1:
 	/* perform read */
-	movw	MACRO_DOLLAR(GRUB_BOOT_MACHINE_BUFFER_SEG), %bx
+	movw	$GRUB_BOOT_MACHINE_BUFFER_SEG, %bx
 	movw	%bx, %es
 	xorw	%bx, %bx
-	movw	MACRO_DOLLAR(0x201), %ax
-	movb	MACRO_DOLLAR(0), %ch
-	movb	MACRO_DOLLAR(0), %dh
-	int	MACRO_DOLLAR(0x13)
+	movw	$0x201, %ax
+	movb	$0, %ch
+	movb	$0, %dh
+	int	$0x13

 	/* if error, jump to "LOCAL(probe_loop)" */
 	jc	LOCAL(probe_loop)

 	/* %cl is already the correct value! */
-	movb	MACRO_DOLLAR(1), %dh
-	movb	MACRO_DOLLAR(79), %ch
+	movb	$1, %dh
+	movb	$79, %ch

 	jmp	LOCAL(final_init)
 	.endm
@@ -165,8 +160,8 @@ start:
 	 * this area.
 	 */

-	.org GRUB_BOOT_MACHINE_BPB_START
-	.org 4
+	. = _start + GRUB_BOOT_MACHINE_BPB_START
+	. = _start + 4
 #endif
 #ifdef HYBRID_BOOT
 	floppy
@@ -174,23 +169,21 @@ start:
 	scratch
 #endif

-	.org GRUB_BOOT_MACHINE_BPB_END
+	. = _start + GRUB_BOOT_MACHINE_BPB_END
 	/*
 	 * End of BIOS parameter block.
 	 */

-LOCAL(kernel_address):
+kernel_address:
 	.word	GRUB_BOOT_MACHINE_KERNEL_ADDR

 #ifndef HYBRID_BOOT
-	.org GRUB_BOOT_MACHINE_KERNEL_SECTOR
-LOCAL(kernel_sector):
-	.long	1
-LOCAL(kernel_sector_high):
-	.long	0
+	. = _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR
+kernel_sector:
+	.long	1, 0
 #endif

-	.org GRUB_BOOT_MACHINE_BOOT_DRIVE
+	. = _start + GRUB_BOOT_MACHINE_BOOT_DRIVE
 boot_drive:
 	.byte 0xff	/* the disk to load kernel from */
 			/* 0xff means use the boot drive */
@@ -208,7 +201,7 @@ LOCAL(after_BPB):
         * possible boot drive. If GRUB is installed into a floppy,
         * this does nothing (only jump).
         */
-	.org GRUB_BOOT_MACHINE_DRIVE_CHECK
+	. = _start + GRUB_BOOT_MACHINE_DRIVE_CHECK
 boot_drive_check:
        jmp     3f	/* grub-setup may overwrite this jump */
        testb   $0x80, %dl
@@ -275,7 +268,7 @@ real_start:
 	andw	$1, %cx
 	jz	LOCAL(chs_mode)

-LOCAL(lba_mode):
+lba_mode:
 	xorw	%ax, %ax
 	movw	%ax, 4(%si)

@@ -290,9 +283,9 @@ LOCAL(lba_mode):
 	movw	$0x0010, (%si)

 	/* the absolute address */
-	movl	LOCAL(kernel_sector), %ebx
+	movl	kernel_sector, %ebx
 	movl	%ebx, 8(%si)
-	movl	LOCAL(kernel_sector_high), %ebx
+	movl	kernel_sector + 4, %ebx
 	movl	%ebx, 12(%si)

 	/* the segment of buffer address */
@@ -325,12 +318,11 @@ LOCAL(chs_mode):
 	int	$0x13
 	jnc	LOCAL(final_init)

-	popw	%dx
 	/*
 	 *  The call failed, so maybe use the floppy probe instead.
 	 */
-	testb	%dl, %dl
-	jnb	LOCAL(floppy_probe)
+	testb	$GRUB_BOOT_MACHINE_BIOS_HD_FLAG, %dl
+	jz	LOCAL(floppy_probe)

 	/* Nope, we definitely have a hard disk, and we're screwed. */
 	ERR(hd_probe_error_string)
@@ -361,13 +353,13 @@ LOCAL(final_init):

 setup_sectors:
 	/* load logical sector start (top half) */
-	movl	LOCAL(kernel_sector_high), %eax
+	movl	kernel_sector + 4, %eax

 	orl	%eax, %eax
 	jnz	LOCAL(geometry_error)

 	/* load logical sector start (bottom half) */
-	movl	LOCAL(kernel_sector), %eax
+	movl	kernel_sector, %eax

 	/* zero %edx */
 	xorl	%edx, %edx
@@ -452,7 +444,7 @@ LOCAL(copy_buffer):
 	popa

 	/* boot kernel */
-	jmp	*(LOCAL(kernel_address))
+	jmp	*(kernel_address)

 /* END OF MAIN LOOP */

@@ -511,13 +503,11 @@ LOCAL(message):
 	 */

 #ifdef HYBRID_BOOT
-	.org 0x1b0
-LOCAL(kernel_sector):
-	.long	1
-LOCAL(kernel_sector_high):
-	.long	0
+	. = _start + 0x1b0
+kernel_sector:
+	.long	1, 0
 #endif
-	.org GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC
+	. = _start + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC
 nt_magic:
 	.long 0
 	.word 0
@@ -528,7 +518,7 @@ nt_magic:
 	 *  sneaky, huh?
 	*/

-	.org GRUB_BOOT_MACHINE_PART_START
+	. = _start + GRUB_BOOT_MACHINE_PART_START

 #ifndef HYBRID_BOOT
 	floppy
@@ -536,7 +526,7 @@ nt_magic:
 	scratch
 #endif

-	.org GRUB_BOOT_MACHINE_PART_END
+	. = _start + GRUB_BOOT_MACHINE_PART_END
 	
 /* the last 2 bytes in the sector 0 contain the signature */
 	.word	GRUB_BOOT_MACHINE_SIGNATURE
--- a/grub-core/boot/i386/pc/cdboot.S
+++ b/grub-core/boot/i386/pc/cdboot.S
@@ -43,7 +43,7 @@ _start:
 LOCAL(next):
 	jmp	1f

-	.org 8
+	. = start + 8

 bi_pvd:
 	.long 0		/* LBA of primary volume descriptor.  */
@@ -168,6 +168,6 @@ err_noboot_msg:
 err_cdfail_msg:
 	.ascii	"cdrom read fails\0"

-	.org 0x7FF
+	. = start + 0x7FF

 	.byte	0
--- a/grub-core/boot/i386/pc/diskboot.S
+++ b/grub-core/boot/i386/pc/diskboot.S
@@ -362,7 +362,7 @@ LOCAL(message):
 	.word 0
 	.word 0

-	.org 0x200 - GRUB_BOOT_MACHINE_LIST_SIZE
+	. = _start + 0x200 - GRUB_BOOT_MACHINE_LIST_SIZE
 LOCAL(firstlist):	/* this label has to be before the first list entry!!! */
        /* fill the first data listing with the default */
 blocklist_default_start:
--- a/grub-core/boot/i386/pc/lnxboot.S
+++ b/grub-core/boot/i386/pc/lnxboot.S
@@ -41,7 +41,7 @@ data_start:
 	xorl	%ebp, %ebp
 	jmp	LOCAL(linux_next)

-	.org 0x1F1
+	. = data_start + 0x1F1

 setup_sects:
 	.byte	CODE_SECTORS
@@ -292,4 +292,4 @@ LOCAL(fail):
 err_int15_msg:
 	.ascii	"move memory fails\0"

-	.org (CODE_SECTORS * 512 + 512)
+	. = _start + CODE_SECTORS * 512
--- a/grub-core/boot/i386/pc/pxeboot.S
+++ b/grub-core/boot/i386/pc/pxeboot.S
@@ -38,5 +38,5 @@ start:
 	/* This region is a junk. Do you say that this is wasteful?
 	   But I like that the memory layout of the body is consistent
 	   among different kernels rather than scamping just for 1.5KB. */
-	.org  0x8200 - 0x7C00 - 0x200 - 1
+	. = _start + 0x8200 - 0x7C00 - 0x200 - 1
 	.byte	0
--- a/grub-core/boot/i386/pc/startup_raw.S
+++ b/grub-core/boot/i386/pc/startup_raw.S
@@ -50,23 +50,23 @@ LOCAL (base):
 	 *  This is a special data area.
 	 */

-	.org GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
+	. = _start + GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
 LOCAL(compressed_size):
 	.long 0
-	.org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
+	. = _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
 LOCAL(uncompressed_size):
 	.long 0

-	.org GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY
+	. = _start + GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY
 reed_solomon_redundancy:
 	.long	0
-	.org GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_LENGTH
+	. = _start + GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_LENGTH
 	.short	(LOCAL(reed_solomon_part) - _start)

 /*
 *  This is the area for all of the special variables.
 */
-	.org GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE
+	. = _start + GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE
 LOCAL(boot_dev):
 	.byte	0xFF, 0xFF, 0xFF
 LOCAL(boot_drive):
@@ -89,13 +89,13 @@ LOCAL (codestart):
 	sti		/* we're safe again */

 	/* save the boot drive */
-	movb	%dl, LOCAL(boot_drive)
+	ADDR32	movb	%dl, LOCAL(boot_drive)

 	/* reset disk system (%ah = 0) */
 	int	$0x13

 	/* transition to protected mode */
-	calll	real_to_prot
+	DATA32	call real_to_prot

 	/* The ".code32" directive takes GAS out of 16-bit mode. */
 	.code32
@@ -149,7 +149,7 @@ gate_a20_try_bios:
 	movw	$0x2401, %ax
 	int	$0x15

-	calll	real_to_prot
+	DATA32	call	real_to_prot
 	.code32

 	popl	%ebp
--- a/grub-core/boot/i386/qemu/boot.S
+++ b/grub-core/boot/i386/qemu/boot.S
@@ -18,6 +18,7 @@

 #include <config.h>
 #include <grub/symbol.h>
+#include <grub/i386/pc/memory.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
@@ -31,7 +32,7 @@ _start:

 	jmp	1f

-	.org GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR
+	. = _start + GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR
 VARIABLE(grub_core_entry_addr)
 	.long	0
 1:
@@ -48,9 +49,8 @@ VARIABLE(grub_core_entry_addr)
 	/* Transition to protected mode.  We use pushl to force generation
 	   of a flat return address.  */
 	pushl	$1f
-	jmp	real_to_prot
+	DATA32	jmp real_to_prot
 	.code32
-1:
 	/* Ensure A20 is enabled. We're in qemu, so control port A works
 	   and there is no need to wait since there is no real logic, it's
 	   all emulated.  */
@@ -58,7 +58,8 @@ VARIABLE(grub_core_entry_addr)
 	andb	$(~0x03), %al
 	orb	$0x02, %al
 	outb	$0x92
-	movl	EXT_C(grub_core_entry_addr), %edx
+1:
+	movl	grub_core_entry_addr, %edx
 	jmp	*%edx

 #include "../../../kern/i386/realmode.S"
@@ -66,9 +67,9 @@ VARIABLE(grub_core_entry_addr)
 	/* Intel, in its infinite wisdom, decided to put the i8086 entry point
 	   *right here* and this is why we need this kludge.  */

-	.org GRUB_BOOT_MACHINE_SIZE - 16
+	. = GRUB_BOOT_MACHINE_SIZE - 16

       .code16
       
 	jmp	_start
-	.org GRUB_BOOT_MACHINE_SIZE
+	. = GRUB_BOOT_MACHINE_SIZE
--- a/grub-core/boot/mips/loongson/fwstart.S
+++ b/grub-core/boot/mips/loongson/fwstart.S
@@ -63,18 +63,18 @@ __start:
 	   This way we don't need to sacrifice a register for it.  */
 retry_cs5536:	
 	/* We have only one bus (0). Function is 0.  */
-	lui $t0, %hi(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR_2F)
-	lui $t1, %hi(GRUB_MACHINE_PCI_CONFSPACE_2F)
+	lui $t0, %hi(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR)
+	lui $t1, %hi(GRUB_MACHINE_PCI_CONFSPACE)
 	lui $t3, %hi(GRUB_CS5536_PCIID)
 	addiu $t3, $t3, %lo(GRUB_CS5536_PCIID)
 	ori $t4, $zero, 1
 1:
-	andi $t4, $t4, ((1 << GRUB_PCI_NUM_DEVICES_2F) - 1)
+	andi $t4, $t4, ((1 << GRUB_PCI_NUM_DEVICES) - 1)
 	/* In case of failure try again. CS5536 may be slow to come up.  */
 	beql  $t4, $zero, retry_cs5536
 	 nop
-	sw   $t4, %lo(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR_2F) ($t0)
-	lw   $t2, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_PCI_REG_PCI_ID) ($t1)
+	sw   $t4, %lo(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR) ($t0)
+	lw   $t2, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_PCI_REG_PCI_ID) ($t1)
 	bnel  $t2, $t3, 1b
 	 sll $t4, $t4, 1

@@ -86,9 +86,9 @@ retry_cs5536:
 	 move $a0, $t4
 #endif

-	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE_2F)
+	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE)
 	li  $t1, GRUB_CS5536_MSR_MAILBOX_CONFIG_ENABLED
-	sw  $t1, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_CS5536_MSR_MAILBOX_CONFIG) ($t0)
+	sw  $t1, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_CONFIG) ($t0)
 	
 	/* Set GPIO LBAR.  */
 	lui $a0, %hi(GRUB_CS5536_MSR_GPIO_BAR)
@@ -121,21 +121,21 @@ retry_cs5536:
 	bal message
 	  addiu $a0, $a0, %lo(smbus_enabled)

-	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS)
+	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS)

 	/* Disable SMB.  */
-	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)
+	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)

 	/* Disable interrupts.  */
-	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1) ($t0)
+	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1) ($t0)

 	/* Set as master.  */
-	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_ADDR) ($t0)
+	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_ADDR) ($t0)

 	/* Launch SMBus controller at slowest speed possible.  */
 	ori $t1, $zero, 0xff
-	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL3) ($t0)
-	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)
+	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL3) ($t0)
+	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)

 	/* Yeeloong and Fuloong2f have only one memory slot.  */
 	/* Output first byte on serial for debugging.  */
@@ -162,7 +162,7 @@ retry_cs5536:

 	b continue

-	.org GRUB_CPU_LOONGSON_FLASH_TLB_REFILL - GRUB_CPU_LOONGSON_FLASH_START
+	. = start + GRUB_CPU_LOONGSON_FLASH_TLB_REFILL - GRUB_CPU_LOONGSON_FLASH_START
 tlb_refill:	
 	mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC
 	mfc0 $s2, GRUB_CPU_LOONGSON_COP0_BADVADDR
@@ -196,13 +196,13 @@ tlb_refill:
 	b fatal
 	 addiu $a0, $a0, %lo(unhandled_tlb_refill)

-	.org GRUB_CPU_LOONGSON_FLASH_CACHE_ERROR - GRUB_CPU_LOONGSON_FLASH_START
+	. = start + GRUB_CPU_LOONGSON_FLASH_CACHE_ERROR - GRUB_CPU_LOONGSON_FLASH_START
 cache_error:
 	lui $a0, %hi(unhandled_cache_error)
 	b fatal
 	 addiu $a0, $a0, %lo(unhandled_cache_error)

-	.org GRUB_CPU_LOONGSON_FLASH_OTHER_EXCEPTION - GRUB_CPU_LOONGSON_FLASH_START
+	. = start + GRUB_CPU_LOONGSON_FLASH_OTHER_EXCEPTION - GRUB_CPU_LOONGSON_FLASH_START
 other_exception:
 	mfc0 $s0, GRUB_CPU_LOONGSON_COP0_CAUSE
 	mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC
@@ -237,8 +237,8 @@ other_exception:
 	 addiu $a0, $a0, %lo(unhandled_exception)

 gpio_init:
-	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_GPIO)
-	addiu  $t0, $t0, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_GPIO)
+	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO)
+	addiu  $t0, $t0, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO)
 	lui $t1, %hi (gpio_dump)
 	addiu $t1, $t1, %lo (gpio_dump)

@@ -344,7 +344,7 @@ printhex:
 	 nop
 	srl  $t1, $a0, 28
 	addiu $t1, $t1, -10
-	bltz  $t1, 2f
+	blt  $t1, $zero, 2f
 	 sll  $a0, $a0, 4
 	addiu $t1, $t1, 'A'-10-'0' 
 2:	addiu $t1, $t1, '0'+10
@@ -368,18 +368,18 @@ self:
           Clobbered:	 $t0
 	*/
 wrmsr:
-	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE_2F)
-	sw  $a0, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_CS5536_MSR_MAILBOX_ADDR) ($t0)
-	sw  $a1, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_CS5536_MSR_MAILBOX_DATA0) ($t0)
+	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE)
+	sw  $a0, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_ADDR) ($t0)
+	sw  $a1, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_DATA0) ($t0)
 	jr $ra
-	 sw  $a2, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_CS5536_MSR_MAILBOX_DATA1) ($t0)
+	 sw  $a2, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_DATA1) ($t0)

 	/* Wait for SMBus data or empty transmitter.  */
 	/* In: $a0 = exception handler. Out: none. Clobbered: $t0, $t1  */
 smbus_wait:
 1:	
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_STATUS + GRUB_MACHINE_PCI_IO_BASE_2F)
-	lb $t0, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_STATUS + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_STATUS + GRUB_MACHINE_PCI_IO_BASE)
+	lb $t0, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_STATUS + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	andi $t1, $t0, GRUB_CS5536_SMB_REG_STATUS_SDAST
 	bne $t1, $zero, return
 	 nop
@@ -398,55 +398,55 @@ read_spd:
 	move $t2, $a0
 	move $t3, $ra
 	lui $a0, %hi(read_spd_fail)
-	addiu $a0, $a0, %lo(read_spd_fail)
+	addiu $a0, $a0, %hi(read_spd_fail)

 	/* Send START.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F)
-	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE)
+	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	ori $t1, $t1, GRUB_CS5536_SMB_REG_CTRL1_START
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	
 	/* Send device address.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
 	sll $t1, $a1, 1
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)

 	/* Send ACK.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F)
-	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE)
+	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	ori $t1, $t1, GRUB_CS5536_SMB_REG_CTRL1_ACK
-	sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)

 	/* Send byte address.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
 	bal smbus_wait
-	 sb $t2, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t2, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)

 	/* Send START.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F)
-	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE)
+	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	ori $t1, $t1, GRUB_CS5536_SMB_REG_CTRL1_START
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)

 	/* Send device address.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
 	sll $t1, $a1, 1
 	ori $t1, $t1, 1
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)

 	/* Send STOP.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F)
-	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE)
+	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	ori $t1, $t1, GRUB_CS5536_SMB_REG_CTRL1_STOP
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)

-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F)
-	lb $v0, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
+	lb $v0, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	jr $t3
 	 andi $v0, $v0, 0xff
 read_spd_fail:
@@ -547,7 +547,7 @@ gpio_dump:
 #endif
 gpio_dump_end:	

-	.p2align 3
+	.p2align

 write_dumpreg:	
 	ld $t2, 0($t6)
--- a/grub-core/boot/mips/startup_raw.S
+++ b/grub-core/boot/mips/startup_raw.S
@@ -22,13 +22,11 @@
 #include <grub/machine/memory.h>
 #include <grub/machine/kernel.h>
 #include <grub/offsets.h>
-#include <grub/mips/asm.h>

 #define BASE_ADDR 8

 .extern __bss_start
 .extern _end
-.extern _edata

 	.globl __start, _start, start
 	.set noreorder
@@ -40,13 +38,13 @@ start:
 	bal codestart
 	 nop
 base:	
-	.org GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
+	. = _start + GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
 compressed_size:
 	.long 0
-	.org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
+	. = _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
 uncompressed_size:
 	.long 0
-	.org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_ADDR
+	. = _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_ADDR
 uncompressed_addr:
 	.long 0
 codestart:
@@ -119,50 +117,50 @@ parsestr:
 	move $v0, $zero
 	move $t3, $t1
 3:	
-	lb GRUB_ASM_T4, 0($t2)
-	lb GRUB_ASM_T5, 0($t3)
+	lb $t4, 0($t2)
+	lb $t5, 0($t3)
 	addiu $t2, $t2, 1
 	addiu $t3, $t3, 1
-	beq GRUB_ASM_T5, $zero, 1f
+	beq $t5, $zero, 1f
 	 nop
-	beq GRUB_ASM_T5, GRUB_ASM_T4, 3b
+	beq $t5, $t4, 3b
 	 nop
-	bne GRUB_ASM_T4, $zero, 1f
+	bne $t4, $zero, 1f
 	 nop

 	addiu $t3, $t3, 0xffff
 digcont:	
-	lb GRUB_ASM_T5, 0($t3)
+	lb $t5, 0($t3)
 	/* Substract '0' from digit.  */
-	addiu GRUB_ASM_T5, GRUB_ASM_T5, 0xffd0
-	bltz GRUB_ASM_T5, 1f
+	addiu $t5, $t5, 0xffd0
+	bltz $t5, 1f
 	 nop
-	addiu GRUB_ASM_T4, GRUB_ASM_T5, 0xfff7
-	bgtz GRUB_ASM_T4, 1f
+	addiu $t4, $t5, 0xfff7
+	bgtz $t4, 1f
 	 nop
 	/* Multiply $v0 by 10 with bitshifts. */
 	sll $v0, $v0, 1
-	sll GRUB_ASM_T4, $v0, 2
-	addu $v0, $v0, GRUB_ASM_T4
-	addu $v0, $v0, GRUB_ASM_T5
+	sll $t4, $v0, 2
+	addu $v0, $v0, $t4
+	addu $v0, $v0, $t5
 	addiu $t3, $t3, 1
 	b digcont
 	 nop
 1:
 	jr $ra
 	 nop
-busclockstr:	.asciz "busclock="
-cpuclockstr:	.asciz "cpuclock="
-memsizestr:	.asciz "memsize="
-highmemsizestr:	.asciz "highmemsize="
-machtype_yeeloong_str1:	.asciz "machtype=8.9"
-machtype_yeeloong_str2:	.asciz "machtype=lemote-yeeloong-"
-machtype_fuloong2f_str:	.asciz "machtype=lemote-fuloong-2f"
-machtype_fuloong2e_str:	.asciz "machtype=lemote-fuloong-2e"
-pmon_yeeloong_str:	.asciz "PMON_VER=LM8"
-pmon_fuloong2f_str:	.asciz "PMON_VER=LM6"
-pmon_yeeloong_verstr:	.asciz "Version=LM8"
-pmon_fuloong2f_verstr:	.asciz "Version=LM6"
+busclockstr:	.asciiz "busclock="
+cpuclockstr:	.asciiz "cpuclock="
+memsizestr:	.asciiz "memsize="
+highmemsizestr:	.asciiz "highmemsize="
+machtype_yeeloong_str1:	.asciiz "machtype=8.9"
+machtype_yeeloong_str2:	.asciiz "machtype=lemote-yeeloong-"
+machtype_fuloong2f_str:	.asciiz "machtype=lemote-fuloong-2f"
+machtype_fuloong2e_str:	.asciiz "machtype=lemote-fuloong-2e"
+pmon_yeeloong_str:	.asciiz "PMON_VER=LM8"
+pmon_fuloong2f_str:	.asciiz "PMON_VER=LM6"
+pmon_yeeloong_verstr:	.asciiz "Version=LM8"
+pmon_fuloong2f_verstr:	.asciiz "Version=LM6"
 	.p2align 2

 argdone:
@@ -183,10 +181,10 @@ argdone:
 	b argdone
  	 addiu $a1, $a1, 4
 do_check:
-	lb GRUB_ASM_T4, 0($t7)
-	beq GRUB_ASM_T4, $zero, 1f
+	lb $t4, 0($t7)
+	beq $t4, $zero, 1f
 	 lb $t3, 0($t6)
-	bne $t3, GRUB_ASM_T4, 2f
+	bne $t3, $t4, 2f
 	 addiu $t6, $t6, 1
 	b do_check
 	 addiu $t7, $t7, 1
@@ -223,8 +221,8 @@ cmdlinedone:

 1:
 	beq $t1, $t3, 2f
-	 lb GRUB_ASM_T4, 0($t2)
-	sb GRUB_ASM_T4, 0($t1)
+	 lb $t4, 0($t2)
+	sb $t4, 0($t1)
 	addiu $t1, $t1, 1
 	b 1b
 	 addiu $t2, $t2, 1
@@ -250,9 +248,8 @@ cmdlinedone:
 #include "../../kern/mips/cache_flush.S"

 	/* Decompress the payload. */
-	lui $a0, %hi(_edata)
-	addiu $a0, $a0, %lo(_edata)
-
+	lui $a0, %hi(__bss_start)
+	addiu $a0, $a0, %lo(__bss_start)
 	lui $t0, %hi(base)
 	addiu $t0, $t0, %lo(base)
 	subu $a0, $a0, $t0
@@ -268,16 +265,16 @@ cmdlinedone:
 	*/
 	move $s6, $a3

-	lui $t9, %hi(EXT_C(grub_decompress_core))
-	addiu $t9, $t9, %lo(EXT_C(grub_decompress_core))
+	lui $t0, %hi(EXT_C(grub_decompress_core))
+	addiu $t0, $t0, %lo(EXT_C(grub_decompress_core))

 #ifdef GRUB_MACHINE_ARC
 	lui $sp, %hi(_start - 512)
-	jalr $t9
+	jalr $t0
 	 addiu $sp, $sp, %lo(_start - 512)
 #else
 	lui $sp, %hi(_start - 256)
-	jalr $t9
+	jalr $t0
 	 addiu $sp, $sp, %lo(_start - 256)
 #endif	
 	move $a0, $s1
@@ -290,11 +287,3 @@ cmdlinedone:

 	jr $t1
 	 nop
-	/* Ensure that .data section is created. In code we suppose that _edata
-	   is first location not in decompressor image. Strictly speaking it's
-	   _edata only when .data is present and _etext otherwise. But checking
-	   for .data presence would cost more in code than it is to ensure that
-	   .data is created.
-	*/
-	.data
-	.long 0
--- a/grub-core/boot/sparc64/ieee1275/boot.S
+++ b/grub-core/boot/sparc64/ieee1275/boot.S
@@ -41,18 +41,18 @@ pic_base:
 	 * After loading in that block we will execute it by jumping to the
 	 * load address plus the size of the prepended A.OUT header (32 bytes).
 	 */
-	.org GRUB_BOOT_MACHINE_BOOT_DEVPATH
+	. = _start + GRUB_BOOT_MACHINE_BOOT_DEVPATH
 boot_path:
-	.org GRUB_BOOT_MACHINE_KERNEL_BYTE
-boot_path_end:
+	. = _start + GRUB_BOOT_MACHINE_KERNEL_BYTE
 kernel_byte:		.xword (2 << 9)
+boot_path_end:
 kernel_address:		.word  GRUB_BOOT_MACHINE_KERNEL_ADDR
 #else
-#define boot_path (_start + 512 + SCRATCH_PAD_BOOT_SIZE)
+#define boot_path (_start + 512)
 #define boot_path_end (_start + 1024)
 #include <grub/offsets.h>

-	.org 8
+	. = _start + 8
 kernel_byte:		.xword (2 << 9)
 kernel_size:	        .word  512
 kernel_address:		.word  GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS
@@ -140,11 +140,7 @@ prom_call:

 boot_continue:
 	mov	%o7, PIC_REG		/* PIC base */
-#ifndef CDBOOT
 	sethi	%hi(SCRATCH_PAD_BOOT), %l1	/* OF argument slots */
-#else
-	GET_ABS(_start + 512, %l1)	/* OF argument slots */
-#endif

 	/* Find the /chosen node so we can fetch the stdout handle,
 	 * and thus perform console output.
@@ -224,7 +220,7 @@ bootpath_known:
 #else
 	 nop
 #endif
-	.org GRUB_BOOT_MACHINE_CODE_END
+	. = _start + GRUB_BOOT_MACHINE_CODE_END

 /* the last 4 bytes in the sector 0 contain the signature */
 	.word	GRUB_BOOT_MACHINE_SIGNATURE
--- a/grub-core/boot/sparc64/ieee1275/diskboot.S
+++ b/grub-core/boot/sparc64/ieee1275/diskboot.S
@@ -136,7 +136,7 @@ lastlist:
 	.word	0
 	.word	0

-	.org (0x200 - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE)
+	. = _start + (0x200 - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE)
 blocklist_default_start:
 	.word	0
 	.word	2
--- a/grub-core/braille/brltty/Bindings/Java/Brlapi.java
+++ b/grub-core/braille/brltty/Bindings/Java/Brlapi.java
@@ -0,0 +1,90 @@
+/*
+ * libbrlapi - A library providing access to braille terminals for applications.
+ *
+ * Copyright (C) 2006-2012 by
+ *   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+ *   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+ *
+ * libbrlapi comes with ABSOLUTELY NO WARRANTY.
+ *
+ * This is free software, placed under the terms of the
+ * GNU Lesser General Public License, as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any
+ * later version. Please see the file LICENSE-LGPL for details.
+ *
+ * Web Page: http://mielke.cc/brltty/
+ *
+ * This software is maintained by Dave Mielke <dave@mielke.cc>.
+ */
+
+package org.a11y.BrlAPI;
+
+public class Brlapi extends Native implements Constants {
+  protected final ConnectionSettings settings;
+  protected final int fileDescriptor;
+
+  public Brlapi (ConnectionSettings settings) throws Error {
+    this.settings = new ConnectionSettings();
+    fileDescriptor = openConnection(settings, this.settings);
+  }
+
+  protected void finalize () {
+    closeConnection();
+  }
+
+  public String getHost () {
+    return settings.host;
+  }
+
+  public String getAuth () {
+    return settings.auth;
+  }
+
+  public int getFileDescriptor () {
+    return fileDescriptor;
+  }
+
+  public int enterTtyMode (int tty) throws Error {
+    return enterTtyMode(tty, null);
+  }
+
+  public int enterTtyMode (String driver) throws Error {
+    return enterTtyMode(TTY_DEFAULT, driver);
+  }
+
+  public int enterTtyMode () throws Error {
+    return enterTtyMode(null);
+  }
+
+  public void enterTtyModeWithPath (int ttys[]) throws Error {
+    enterTtyModeWithPath(ttys, null);
+  }
+
+  public void writeText (int cursor) throws Error {
+    writeText(cursor, null);
+  }
+
+  public void writeText (String text) throws Error {
+    writeText(CURSOR_OFF, text);
+  }
+
+  public void writeText (String text, int cursor) throws Error {
+    writeText(cursor, text);
+  }
+
+  public void writeText (int cursor, String text) throws Error {
+    if (text != null) {
+      DisplaySize size = getDisplaySize();
+      int count = size.getWidth() * size.getHeight();
+
+      {
+        StringBuffer sb = new StringBuffer(text);
+        while (sb.length() < count) sb.append(' ');
+        text = sb.toString();
+      }
+
+      text = text.substring(0, count);
+    }
+    writeTextNative(cursor, text);
+  }
+}
--- a/grub-core/braille/brltty/Bindings/Java/ConnectionSettings.java
+++ b/grub-core/braille/brltty/Bindings/Java/ConnectionSettings.java
@@ -0,0 +1,38 @@
+/*
+ * libbrlapi - A library providing access to braille terminals for applications.
+ *
+ * Copyright (C) 2006-2012 by
+ *   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+ *   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+ *
+ * libbrlapi comes with ABSOLUTELY NO WARRANTY.
+ *
+ * This is free software, placed under the terms of the
+ * GNU Lesser General Public License, as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any
+ * later version. Please see the file LICENSE-LGPL for details.
+ *
+ * Web Page: http://mielke.cc/brltty/
+ *
+ * This software is maintained by Dave Mielke <dave@mielke.cc>.
+ */
+
+package org.a11y.BrlAPI;
+
+public class ConnectionSettings {
+  public String host;
+  public String auth;
+
+  public ConnectionSettings (String host, String auth) {
+    this.host = host;
+    this.auth = auth;
+  }
+
+  public ConnectionSettings (String host) {
+    this(host, null);
+  }
+
+  public ConnectionSettings () {
+    this(null);
+  }
+}
--- a/grub-core/braille/brltty/Bindings/Java/Constants.java
+++ b/grub-core/braille/brltty/Bindings/Java/Constants.java
@@ -0,0 +1,426 @@
+package org.a11y.BrlAPI;
+
+public interface Constants {
+  int TTY_DEFAULT = -1;
+  /**  */
+  int DISPLAY_DEFAULT = -1;
+  /**  */
+  int CURSOR_LEAVE = -1;
+  /**  */
+  int CURSOR_OFF = 0;
+  int rangeType_all = 0;
+  int rangeType_type = 1;
+  int rangeType_command = 2;
+  int rangeType_key = 3;
+  int rangeType_code = 4;
+  /**  */
+  int ERROR_SUCCESS = 0;
+  /**  */
+  int ERROR_NOMEM = 1;
+  /**  */
+  int ERROR_TTYBUSY = 2;
+  /**  */
+  int ERROR_DEVICEBUSY = 3;
+  /**  */
+  int ERROR_UNKNOWN_INSTRUCTION = 4;
+  /**  */
+  int ERROR_ILLEGAL_INSTRUCTION = 5;
+  /**  */
+  int ERROR_INVALID_PARAMETER = 6;
+  /**  */
+  int ERROR_INVALID_PACKET = 7;
+  /**  */
+  int ERROR_CONNREFUSED = 8;
+  /**  */
+  int ERROR_OPNOTSUPP = 9;
+  /**  */
+  int ERROR_GAIERR = 10;
+  /**  */
+  int ERROR_LIBCERR = 11;
+  /**  */
+  int ERROR_UNKNOWNTTY = 12;
+  /**  */
+  int ERROR_PROTOCOL_VERSION = 13;
+  /**  */
+  int ERROR_EOF = 14;
+  /**  */
+  int ERROR_EMPTYKEY = 15;
+  /**  */
+  int ERROR_DRIVERERROR = 16;
+  /**  */
+  int ERROR_AUTHENTICATION = 17;
+  /**  */
+  long KEY_MAX = 0xffffffffffffffffL;
+  /**  */
+  long KEY_FLAGS_MASK = 0xffffffff00000000L;
+  /**  */
+  int KEY_FLAGS_SHIFT = 32;
+  /**  */
+  long KEY_TYPE_MASK = 0xe0000000L;
+  /**  */
+  int KEY_TYPE_SHIFT = 29;
+  /**  */
+  int KEY_TYPE_CMD = 0x20000000;
+  /**  */
+  int KEY_TYPE_SYM = 0x0;
+  /**  */
+  long KEY_CODE_MASK = 0x1fffffffL;
+  /**  */
+  int KEY_CODE_SHIFT = 0;
+  /**  */
+  long KEY_CMD_BLK_MASK = 0x1fff0000L;
+  /**  */
+  int KEY_CMD_BLK_SHIFT = 16;
+  /**  */
+  long KEY_CMD_ARG_MASK = 0xffffL;
+  /**  */
+  int KEY_CMD_ARG_SHIFT = 0;
+  /**  */
+  int KEY_SYM_BACKSPACE = 0xff08;
+  /**  */
+  int KEY_SYM_TAB = 0xff09;
+  /**  */
+  int KEY_SYM_LINEFEED = 0xff0d;
+  /**  */
+  int KEY_SYM_ESCAPE = 0xff1b;
+  /**  */
+  int KEY_SYM_HOME = 0xff50;
+  /**  */
+  int KEY_SYM_LEFT = 0xff51;
+  /**  */
+  int KEY_SYM_UP = 0xff52;
+  /**  */
+  int KEY_SYM_RIGHT = 0xff53;
+  /**  */
+  int KEY_SYM_DOWN = 0xff54;
+  /**  */
+  int KEY_SYM_PAGE_UP = 0xff55;
+  /**  */
+  int KEY_SYM_PAGE_DOWN = 0xff56;
+  /**  */
+  int KEY_SYM_END = 0xff57;
+  /**  */
+  int KEY_SYM_INSERT = 0xff63;
+  /**  */
+  int KEY_SYM_F1 = (0xffbe + 0);
+  /**  */
+  int KEY_SYM_F2 = (0xffbe + 1);
+  /**  */
+  int KEY_SYM_F3 = (0xffbe + 2);
+  /**  */
+  int KEY_SYM_F4 = (0xffbe + 3);
+  /**  */
+  int KEY_SYM_F5 = (0xffbe + 4);
+  /**  */
+  int KEY_SYM_F6 = (0xffbe + 5);
+  /**  */
+  int KEY_SYM_F7 = (0xffbe + 6);
+  /**  */
+  int KEY_SYM_F8 = (0xffbe + 7);
+  /**  */
+  int KEY_SYM_F9 = (0xffbe + 8);
+  /**  */
+  int KEY_SYM_F10 = (0xffbe + 9);
+  /**  */
+  int KEY_SYM_F11 = (0xffbe + 10);
+  /**  */
+  int KEY_SYM_F12 = (0xffbe + 11);
+  /**  */
+  int KEY_SYM_F13 = (0xffbe + 12);
+  /**  */
+  int KEY_SYM_F14 = (0xffbe + 13);
+  /**  */
+  int KEY_SYM_F15 = (0xffbe + 14);
+  /**  */
+  int KEY_SYM_F16 = (0xffbe + 15);
+  /**  */
+  int KEY_SYM_F17 = (0xffbe + 16);
+  /**  */
+  int KEY_SYM_F18 = (0xffbe + 17);
+  /**  */
+  int KEY_SYM_F19 = (0xffbe + 18);
+  /**  */
+  int KEY_SYM_F20 = (0xffbe + 19);
+  /**  */
+  int KEY_SYM_F21 = (0xffbe + 20);
+  /**  */
+  int KEY_SYM_F22 = (0xffbe + 21);
+  /**  */
+  int KEY_SYM_F23 = (0xffbe + 22);
+  /**  */
+  int KEY_SYM_F24 = (0xffbe + 23);
+  /**  */
+  int KEY_SYM_F25 = (0xffbe + 24);
+  /**  */
+  int KEY_SYM_F26 = (0xffbe + 25);
+  /**  */
+  int KEY_SYM_F27 = (0xffbe + 26);
+  /**  */
+  int KEY_SYM_F28 = (0xffbe + 27);
+  /**  */
+  int KEY_SYM_F29 = (0xffbe + 28);
+  /**  */
+  int KEY_SYM_F30 = (0xffbe + 29);
+  /**  */
+  int KEY_SYM_F31 = (0xffbe + 30);
+  /**  */
+  int KEY_SYM_F32 = (0xffbe + 31);
+  /**  */
+  int KEY_SYM_F33 = (0xffbe + 32);
+  /**  */
+  int KEY_SYM_F34 = (0xffbe + 33);
+  /**  */
+  int KEY_SYM_F35 = (0xffbe + 34);
+  /**  */
+  int KEY_SYM_DELETE = 0xffff;
+  /**  */
+  int KEY_SYM_UNICODE = 0x1000000;
+  /** do nothing */
+  int KEY_CMD_NOOP = 0;
+  /** go up one line */
+  int KEY_CMD_LNUP = 1;
+  /** go down one line */
+  int KEY_CMD_LNDN = 2;
+  /** go up several lines */
+  int KEY_CMD_WINUP = 3;
+  /** go down several lines */
+  int KEY_CMD_WINDN = 4;
+  /** go up to nearest line with different content */
+  int KEY_CMD_PRDIFLN = 5;
+  /** go down to nearest line with different content */
+  int KEY_CMD_NXDIFLN = 6;
+  /** go up to nearest line with different highlighting */
+  int KEY_CMD_ATTRUP = 7;
+  /** go down to nearest line with different highlighting */
+  int KEY_CMD_ATTRDN = 8;
+  /** go to top line */
+  int KEY_CMD_TOP = 9;
+  /** go to bottom line */
+  int KEY_CMD_BOT = 10;
+  /** go to beginning of top line */
+  int KEY_CMD_TOP_LEFT = 11;
+  /** go to beginning of bottom line */
+  int KEY_CMD_BOT_LEFT = 12;
+  /** go up to last line of previous paragraph */
+  int KEY_CMD_PRPGRPH = 13;
+  /** go down to first line of next paragraph */
+  int KEY_CMD_NXPGRPH = 14;
+  /** go up to previous command prompt */
+  int KEY_CMD_PRPROMPT = 15;
+  /** go down to next command prompt */
+  int KEY_CMD_NXPROMPT = 16;
+  /** search backward for cut text */
+  int KEY_CMD_PRSEARCH = 17;
+  /** search forward for cut text */
+  int KEY_CMD_NXSEARCH = 18;
+  /** go left one character */
+  int KEY_CMD_CHRLT = 19;
+  /** go right one character */
+  int KEY_CMD_CHRRT = 20;
+  /** go left half a window */
+  int KEY_CMD_HWINLT = 21;
+  /** go right half a window */
+  int KEY_CMD_HWINRT = 22;
+  /** go left one window */
+  int KEY_CMD_FWINLT = 23;
+  /** go right one window */
+  int KEY_CMD_FWINRT = 24;
+  /** go left to nearest non-blank window */
+  int KEY_CMD_FWINLTSKIP = 25;
+  /** go right to nearest non-blank window */
+  int KEY_CMD_FWINRTSKIP = 26;
+  /** go to beginning of line */
+  int KEY_CMD_LNBEG = 27;
+  /** go to end of line */
+  int KEY_CMD_LNEND = 28;
+  /** go to cursor */
+  int KEY_CMD_HOME = 29;
+  /** go back after cursor tracking */
+  int KEY_CMD_BACK = 30;
+  /** go to cursor or go back after cursor tracking */
+  int KEY_CMD_RETURN = 31;
+  /** freeze/unfreeze screen image */
+  int KEY_CMD_FREEZE = 32;
+  /** toggle display mode attributes/text */
+  int KEY_CMD_DISPMD = 33;
+  /** toggle text style 6-dot/8-dot */
+  int KEY_CMD_SIXDOTS = 34;
+  /** toggle sliding window on/off */
+  int KEY_CMD_SLIDEWIN = 35;
+  /** toggle skipping of lines with identical content on/off */
+  int KEY_CMD_SKPIDLNS = 36;
+  /** toggle skipping of blank windows on/off */
+  int KEY_CMD_SKPBLNKWINS = 37;
+  /** toggle cursor visibility on/off */
+  int KEY_CMD_CSRVIS = 38;
+  /** toggle hidden cursor on/off */
+  int KEY_CMD_CSRHIDE = 39;
+  /** toggle cursor tracking on/off */
+  int KEY_CMD_CSRTRK = 40;
+  /** toggle cursor style block/underline */
+  int KEY_CMD_CSRSIZE = 41;
+  /** toggle cursor blinking on/off */
+  int KEY_CMD_CSRBLINK = 42;
+  /** toggle attribute underlining on/off */
+  int KEY_CMD_ATTRVIS = 43;
+  /** toggle attribute blinking on/off */
+  int KEY_CMD_ATTRBLINK = 44;
+  /** toggle capital letter blinking on/off */
+  int KEY_CMD_CAPBLINK = 45;
+  /** toggle alert tunes on/off */
+  int KEY_CMD_TUNES = 46;
+  /** toggle autorepeat on/off */
+  int KEY_CMD_AUTOREPEAT = 47;
+  /** toggle autospeak on/off */
+  int KEY_CMD_AUTOSPEAK = 48;
+  /** enter/leave help display */
+  int KEY_CMD_HELP = 49;
+  /** enter/leave status display */
+  int KEY_CMD_INFO = 50;
+  /** enter/leave command learn mode */
+  int KEY_CMD_LEARN = 51;
+  /** enter/leave preferences menu */
+  int KEY_CMD_PREFMENU = 52;
+  /** save preferences to disk */
+  int KEY_CMD_PREFSAVE = 53;
+  /** restore preferences from disk */
+  int KEY_CMD_PREFLOAD = 54;
+  /** go to first item */
+  int KEY_CMD_MENU_FIRST_ITEM = 55;
+  /** go to last item */
+  int KEY_CMD_MENU_LAST_ITEM = 56;
+  /** go to previous item */
+  int KEY_CMD_MENU_PREV_ITEM = 57;
+  /** go to next item */
+  int KEY_CMD_MENU_NEXT_ITEM = 58;
+  /** select previous choice */
+  int KEY_CMD_MENU_PREV_SETTING = 59;
+  /** select next choice */
+  int KEY_CMD_MENU_NEXT_SETTING = 60;
+  /** stop speaking */
+  int KEY_CMD_MUTE = 61;
+  /** go to current speech position */
+  int KEY_CMD_SPKHOME = 62;
+  /** speak current line */
+  int KEY_CMD_SAY_LINE = 63;
+  /** speak from top of screen through current line */
+  int KEY_CMD_SAY_ABOVE = 64;
+  /** speak from current line through bottom of screen */
+  int KEY_CMD_SAY_BELOW = 65;
+  /** decrease speech rate */
+  int KEY_CMD_SAY_SLOWER = 66;
+  /** increase speech rate */
+  int KEY_CMD_SAY_FASTER = 67;
+  /** decrease speech volume */
+  int KEY_CMD_SAY_SOFTER = 68;
+  /** increase speech volume */
+  int KEY_CMD_SAY_LOUDER = 69;
+  /** switch to previous virtual terminal */
+  int KEY_CMD_SWITCHVT_PREV = 70;
+  /** switch to next virtual terminal */
+  int KEY_CMD_SWITCHVT_NEXT = 71;
+  /** bring cursor to line */
+  int KEY_CMD_CSRJMP_VERT = 72;
+  /** insert cut text at cursor */
+  int KEY_CMD_PASTE = 73;
+  /** restart braille driver */
+  int KEY_CMD_RESTARTBRL = 74;
+  /** restart speech driver */
+  int KEY_CMD_RESTARTSPEECH = 75;
+  /** braille display temporarily unavailable */
+  int KEY_CMD_OFFLINE = 76;
+  /** enable feature */
+  int KEY_FLG_TOGGLE_ON = 0x100;
+  /** disable feature */
+  int KEY_FLG_TOGGLE_OFF = 0x200;
+  /** mask for all toggle flags */
+  int KEY_FLG_TOGGLE_MASK = (KEY_FLG_TOGGLE_ON | KEY_FLG_TOGGLE_OFF);
+  /** bring cursor into window after function */
+  int KEY_FLG_MOTION_ROUTE = 0x400;
+  /** execute command on key press */
+  int KEY_FLG_REPEAT_INITIAL = 0x8000;
+  /** wait before repeating */
+  int KEY_FLG_REPEAT_DELAY = 0x4000;
+  /** mask for all repeat flags */
+  int KEY_FLG_REPEAT_MASK = (KEY_FLG_REPEAT_INITIAL | KEY_FLG_REPEAT_DELAY);
+  /** bring cursor to character */
+  int KEY_CMD_ROUTE = 0x10000;
+  /** start new cut buffer at character */
+  int KEY_CMD_CUTBEGIN = 0x20000;
+  /** append to existing cut buffer from character */
+  int KEY_CMD_CUTAPPEND = 0x30000;
+  /** rectangular cut to character */
+  int KEY_CMD_CUTRECT = 0x40000;
+  /** linear cut to character */
+  int KEY_CMD_CUTLINE = 0x50000;
+  /** switch to virtual terminal */
+  int KEY_CMD_SWITCHVT = 0x60000;
+  /** go up to nearest line with less indent than character */
+  int KEY_CMD_PRINDENT = 0x70000;
+  /** go down to nearest line with less indent than character */
+  int KEY_CMD_NXINDENT = 0x80000;
+  /** describe character */
+  int KEY_CMD_DESCCHAR = 0x90000;
+  /** place left end of window at character */
+  int KEY_CMD_SETLEFT = 0xa0000;
+  /** remember current window position */
+  int KEY_CMD_SETMARK = 0xb0000;
+  /** go to remembered window position */
+  int KEY_CMD_GOTOMARK = 0xc0000;
+  /** go to selected line */
+  int KEY_CMD_GOTOLINE = 0xd0000;
+  /** scale arg=0X00-0XFF to screen height */
+  int KEY_FLG_LINE_SCALED = 0x100;
+  /** go to beginning of line */
+  int KEY_FLG_LINE_TOLEFT = 0x200;
+  /** go up to nearest line with different character */
+  int KEY_CMD_PRDIFCHAR = 0xe0000;
+  /** go down to nearest line with different character */
+  int KEY_CMD_NXDIFCHAR = 0xf0000;
+  /** copy characters to cut buffer */
+  int KEY_CMD_COPYCHARS = 0x100000;
+  /** append characters to cut buffer */
+  int KEY_CMD_APNDCHARS = 0x110000;
+  /** input braille character */
+  int KEY_CMD_PASSDOTS = 0x220000;
+  /** shift key pressed */
+  int KEY_FLG_SHIFT = 0x1;
+  /** convert to uppercase */
+  int KEY_FLG_UPPER = 0x2;
+  /** control key pressed */
+  int KEY_FLG_CONTROL = 0x4;
+  /** meta key pressed */
+  int KEY_FLG_META = 0x8;
+  /** upper-left dot of standard braille cell */
+  byte DOT1 = (byte) (0001);
+  /** middle-left dot of standard braille cell */
+  byte DOT2 = (byte) (0002);
+  /** lower-left dot of standard braille cell */
+  byte DOT3 = (byte) (0004);
+  /** upper-right dot of standard braille cell */
+  byte DOT4 = (byte) (0010);
+  /** middle-right dot of standard braille cell */
+  byte DOT5 = (byte) (0020);
+  /** lower-right dot of standard braille cell */
+  byte DOT6 = (byte) (0040);
+  /** lower-left dot of computer braille cell */
+  byte DOT7 = (byte) (0100);
+  /** lower-right dot of computer braille cell */
+  byte DOT8 = (byte) (0200);
+  /** space key pressed */
+  byte DOTC = (byte) (0400);
+  /** input AT (set 2) keyboard scan code */
+  int KEY_CMD_PASSAT = 0x230000;
+  /** input XT (set 1) keyboard scan code */
+  int KEY_CMD_PASSXT = 0x240000;
+  /** input PS/2 (set 3) keyboard scan code */
+  int KEY_CMD_PASSPS2 = 0x250000;
+  /** it is a release scan code */
+  int KEY_FLG_KBD_RELEASE = 0x100;
+  /** it is an emulation 0 scan code */
+  int KEY_FLG_KBD_EMUL0 = 0x200;
+  /** it is an emulation 1 scan code */
+  int KEY_FLG_KBD_EMUL1 = 0x400;
+  /** switch to command context */
+  int KEY_CMD_CONTEXT = 0x260000;
+}
--- a/grub-core/braille/brltty/Bindings/Java/DisplaySize.java
+++ b/grub-core/braille/brltty/Bindings/Java/DisplaySize.java
@@ -0,0 +1,38 @@
+/*
+ * libbrlapi - A library providing access to braille terminals for applications.
+ *
+ * Copyright (C) 2006-2012 by
+ *   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+ *   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+ *
+ * libbrlapi comes with ABSOLUTELY NO WARRANTY.
+ *
+ * This is free software, placed under the terms of the
+ * GNU Lesser General Public License, as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any
+ * later version. Please see the file LICENSE-LGPL for details.
+ *
+ * Web Page: http://mielke.cc/brltty/
+ *
+ * This software is maintained by Dave Mielke <dave@mielke.cc>.
+ */
+
+package org.a11y.BrlAPI;
+
+public class DisplaySize {
+  protected final int width;
+  protected final int height;
+
+  public DisplaySize (int width, int height) {
+    this.width = width;
+    this.height = height; 
+  }
+
+  public int getWidth () {
+    return width;
+  }
+
+  public int getHeight () {
+    return height;
+  }
+}
--- a/grub-core/braille/brltty/Bindings/Java/Error.java
+++ b/grub-core/braille/brltty/Bindings/Java/Error.java
@@ -0,0 +1,53 @@
+/*
+ * libbrlapi - A library providing access to braille terminals for applications.
+ *
+ * Copyright (C) 2006-2012 by
+ *   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+ *   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+ *
+ * libbrlapi comes with ABSOLUTELY NO WARRANTY.
+ *
+ * This is free software, placed under the terms of the
+ * GNU Lesser General Public License, as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any
+ * later version. Please see the file LICENSE-LGPL for details.
+ *
+ * Web Page: http://mielke.cc/brltty/
+ *
+ * This software is maintained by Dave Mielke <dave@mielke.cc>.
+ */
+
+package org.a11y.BrlAPI;
+
+public class Error extends java.lang.Error {
+  static final long serialVersionUID = 0;
+  int brlerrno;
+  int libcerrno;
+  int gaierrno;
+  String errfun;
+  public final native String toString ();
+  public Error (int brlerrno, int libcerrno, int gaierrno, String errfun) {
+    this.brlerrno = brlerrno;
+    this.libcerrno = libcerrno;
+    this.gaierrno = gaierrno;
+    this.errfun = errfun;
+  }
+
+  public final static int SUCCESS             =  0; /* Success */
+  public final static int NOMEM               =  1; /* Not enough memory */
+  public final static int TTYBUSY             =  2; /* Already a connection running in this tty */
+  public final static int DEVICEBUSY          =  3; /* Already a connection using RAW mode */
+  public final static int UNKNOWN_INSTRUCTION =  4; /* Not implemented in protocol */
+  public final static int ILLEGAL_INSTRUCTION =  5; /* Forbiden in current mode */
+  public final static int INVALID_PARAMETER   =  6; /* Out of range or have no sense */
+  public final static int INVALID_PACKET      =  7; /* Invalid size */
+  public final static int CONNREFUSED         =  8; /* Connection refused */
+  public final static int OPNOTSUPP           =  9; /* Operation not supported */
+  public final static int GAIERR              = 10; /* Getaddrinfo error */
+  public final static int LIBCERR             = 11; /* Libc error */
+  public final static int UNKNOWNTTY          = 12; /* Couldn't find out the tty number */
+  public final static int PROTOCOL_VERSION    = 13; /* Bad protocol version */
+  public final static int EOF                 = 14; /* Unexpected end of file */
+  public final static int EMPTYKEY            = 15; /* Too many levels of recursion */
+  public final static int DRIVERERROR         = 16; /* Packet returned by driver too large */
+}
--- a/grub-core/braille/brltty/Bindings/Java/Exception.java
+++ b/grub-core/braille/brltty/Bindings/Java/Exception.java
@@ -0,0 +1,35 @@
+/*
+ * libbrlapi - A library providing access to braille terminals for applications.
+ *
+ * Copyright (C) 2006-2012 by
+ *   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+ *   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+ *
+ * libbrlapi comes with ABSOLUTELY NO WARRANTY.
+ *
+ * This is free software, placed under the terms of the
+ * GNU Lesser General Public License, as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any
+ * later version. Please see the file LICENSE-LGPL for details.
+ *
+ * Web Page: http://mielke.cc/brltty/
+ *
+ * This software is maintained by Dave Mielke <dave@mielke.cc>.
+ */
+
+package org.a11y.BrlAPI;
+
+public class Exception extends java.lang.Exception {
+  static final long serialVersionUID = 0;
+  long handle;
+  int errno;
+  long packettype;
+  byte buf[];
+  public final native String toString ();
+  public Exception (long handle, int errno, int packettype, byte buf[]) {
+    this.handle = handle;
+    this.errno = errno;
+    this.packettype = packettype;
+    this.buf = buf;
+  }
+}
--- a/grub-core/braille/brltty/Bindings/Java/Key.java
+++ b/grub-core/braille/brltty/Bindings/Java/Key.java
@@ -0,0 +1,55 @@
+/*
+ * libbrlapi - A library providing access to braille terminals for applications.
+ *
+ * Copyright (C) 2006-2012 by
+ *   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+ *   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+ *
+ * libbrlapi comes with ABSOLUTELY NO WARRANTY.
+ *
+ * This is free software, placed under the terms of the
+ * GNU Lesser General Public License, as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any
+ * later version. Please see the file LICENSE-LGPL for details.
+ *
+ * Web Page: http://mielke.cc/brltty/
+ *
+ * This software is maintained by Dave Mielke <dave@mielke.cc>.
+ */
+
+package org.a11y.BrlAPI;
+
+public class Key {
+  protected final long code;
+  protected int type;
+  protected int command;
+  protected int argument;
+  protected int flags;
+
+  public final native void expandKeyCode (long code);
+
+  public Key (long code) {
+    this.code = code;
+    expandKeyCode(code);
+  }
+
+  public long getCode () {
+    return code;
+  }
+
+  public int getType () {
+    return type;
+  }
+
+  public int getCommand () {
+    return command;
+  }
+
+  public int getArgument () {
+    return argument;
+  }
+
+  public int getFlags () {
+    return flags;
+  }
+}
--- a/grub-core/braille/brltty/Bindings/Java/Native.java
+++ b/grub-core/braille/brltty/Bindings/Java/Native.java
@@ -0,0 +1,63 @@
+/*
+ * libbrlapi - A library providing access to braille terminals for applications.
+ *
+ * Copyright (C) 2006-2012 by
+ *   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+ *   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+ *
+ * libbrlapi comes with ABSOLUTELY NO WARRANTY.
+ *
+ * This is free software, placed under the terms of the
+ * GNU Lesser General Public License, as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any
+ * later version. Please see the file LICENSE-LGPL for details.
+ *
+ * Web Page: http://mielke.cc/brltty/
+ *
+ * This software is maintained by Dave Mielke <dave@mielke.cc>.
+ */
+
+package org.a11y.BrlAPI;
+
+public class Native {
+  static {
+    System.loadLibrary("brlapi_java");
+  }
+
+  protected long handle;
+
+  protected native int openConnection (
+    ConnectionSettings desiredSettings,
+    ConnectionSettings actualSettings)
+    throws Error;
+  public native void closeConnection ();
+
+  public native String getDriverName () throws Error;
+  public native DisplaySize getDisplaySize () throws Error;
+  
+  public native int enterTtyMode (int tty, String driver) throws Error;
+  public native void enterTtyModeWithPath (int ttys[], String driver) throws Error;
+  public native void leaveTtyMode () throws Error;
+  public native void setFocus (int tty) throws Error;
+
+  protected native void writeTextNative (int cursor, String text) throws Error;
+  public native void writeDots (byte dots[]) throws Error;
+  public native void write (WriteArguments arguments) throws Error;
+
+  public native long readKey (boolean wait) throws Error;
+  public native void ignoreKeys (long type, long keys[]) throws Error;
+  public native void acceptKeys (long type, long keys[]) throws Error;
+
+  public native void ignoreAllKeys () throws Error;
+  public native void acceptAllKeys () throws Error;
+
+  public native void ignoreKeyRanges (long ranges[][]) throws Error;
+  public native void acceptKeyRanges (long ranges[][]) throws Error;
+
+  public native void enterRawMode (String driver) throws Error;
+  public native void leaveRawMode () throws Error;
+  public native int sendRaw (byte buffer[]) throws Error;
+  public native int recvRaw (byte buffer[]) throws Error;
+
+  public static native String getPacketTypeName (long type);
+}
--- a/grub-core/braille/brltty/Bindings/Java/Test.java
+++ b/grub-core/braille/brltty/Bindings/Java/Test.java
@@ -0,0 +1,103 @@
+/*
+ * libbrlapi - A library providing access to braille terminals for applications.
+ *
+ * Copyright (C) 2006-2012 by
+ *   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+ *   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+ *
+ * libbrlapi comes with ABSOLUTELY NO WARRANTY.
+ *
+ * This is free software, placed under the terms of the
+ * GNU Lesser General Public License, as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any
+ * later version. Please see the file LICENSE-LGPL for details.
+ *
+ * Web Page: http://mielke.cc/brltty/
+ *
+ * This software is maintained by Dave Mielke <dave@mielke.cc>.
+ */
+
+package org.a11y.BrlAPI;
+
+public class Test {
+  public static void main(String argv[]) {
+    ConnectionSettings settings = new ConnectionSettings();
+
+    {
+      int argi = 0;
+      while (argi < argv.length) {
+        String arg = argv[argi++];
+
+        if (arg.equals("-host")) {
+          if (argi == argv.length) {
+            System.err.println("Missing host specification.");
+            System.exit(2);
+          }
+
+          settings.host = argv[argi++];
+          continue;
+        }
+
+        System.err.println("Invalid option: " + arg);
+        System.exit(2);
+      }
+    }
+
+    try {
+      System.out.print("Connecting to BrlAPI... ");
+      Brlapi brlapi = new Brlapi(settings);
+      System.out.println("done (fd=" + brlapi.getFileDescriptor() + ")");
+
+      System.out.print("Connected to " + brlapi.getHost());
+      System.out.print(" using key file " + brlapi.getAuth());
+      System.out.println();
+
+      System.out.print("Driver is " + brlapi.getDriverName());
+      System.out.println();
+
+      DisplaySize size = brlapi.getDisplaySize();
+      System.out.println("Display size is " + size.getWidth() + "x" + size.getHeight());
+
+      int tty = brlapi.enterTtyMode();
+      System.out.println("TTY is " + tty);
+
+      brlapi.writeText("ok !! €", Brlapi.CURSOR_OFF);
+      brlapi.writeText(null, 1);
+
+      long key[] = {0};
+      brlapi.ignoreKeys(Brlapi.rangeType_all, key);
+      key[0] = Constants.KEY_TYPE_CMD;
+      brlapi.acceptKeys(Brlapi.rangeType_type, key);
+      long keys[][] = {{0,2},{5,7}};
+      brlapi.ignoreKeyRanges(keys);
+
+      printKey(new Key(brlapi.readKey(true)));
+
+      {
+        WriteArguments args = new WriteArguments();
+        args.regionBegin = 10;
+        args.regionSize = 20;
+        args.text = "Key Pressed €       ";
+        args.andMask = "????????????????????".getBytes();
+        args.cursor = 3;
+        brlapi.write(args);
+      }
+
+      printKey(new Key(brlapi.readKey(true)));
+
+      brlapi.leaveTtyMode();
+      brlapi.closeConnection();
+    } catch (Error error) {
+      System.out.println("got error: " + error);
+      System.exit(3);
+    }
+  }
+
+  private static void printKey (Key key) {
+    System.out.println("got key " + Long.toHexString(key.getCode()) + " (" +
+                       Integer.toHexString(key.getType()) + "," +
+                       Integer.toHexString(key.getCommand()) + "," +
+                       Integer.toHexString(key.getArgument()) + "," +
+                       Integer.toHexString(key.getFlags()) + ")");
+  }
+}
--- a/grub-core/braille/brltty/Bindings/Java/WriteArguments.java
+++ b/grub-core/braille/brltty/Bindings/Java/WriteArguments.java
@@ -0,0 +1,33 @@
+/*
+ * libbrlapi - A library providing access to braille terminals for applications.
+ *
+ * Copyright (C) 2006-2012 by
+ *   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+ *   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+ *
+ * libbrlapi comes with ABSOLUTELY NO WARRANTY.
+ *
+ * This is free software, placed under the terms of the
+ * GNU Lesser General Public License, as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any
+ * later version. Please see the file LICENSE-LGPL for details.
+ *
+ * Web Page: http://mielke.cc/brltty/
+ *
+ * This software is maintained by Dave Mielke <dave@mielke.cc>.
+ */
+
+package org.a11y.BrlAPI;
+
+public class WriteArguments {
+  public int displayNumber = Brlapi.DISPLAY_DEFAULT;
+  public int regionBegin = 0;
+  public int regionSize = 0;
+  public String text = null;
+  public byte andMask[] = null;
+  public byte orMask[] = null;
+  public int cursor = Brlapi.CURSOR_LEAVE;
+
+  public WriteArguments () {
+  }
+}
--- a/grub-core/braille/brltty/Bindings/Java/apitest
+++ b/grub-core/braille/brltty/Bindings/Java/apitest
@@ -0,0 +1,27 @@
+#!/bin/bash -p
+###############################################################################
+# libbrlapi - A library providing access to braille terminals for applications.
+#
+# Copyright (C) 2006-2012 by
+#   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+#   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+#
+# libbrlapi comes with ABSOLUTELY NO WARRANTY.
+#
+# This is free software, placed under the terms of the
+# GNU Lesser General Public License, as published by the Free Software
+# Foundation; either version 2.1 of the License, or (at your option) any
+# later version. Please see the file LICENSE-LGPL for details.
+#
+# Web Page: http://mielke.cc/brltty/
+#
+# This software is maintained by Dave Mielke <dave@mielke.cc>.
+###############################################################################
+
+currentDirectory="$(pwd)"
+
+export LD_LIBRARY_PATH="${currentDirectory}"
+export LD_PRELOAD="${currentDirectory}/../../Programs/libbrlapi.so"
+
+exec java -classpath "${currentDirectory}/classes" org.a11y.BrlAPI.Test "${@}"
+exit "${?}"
--- a/grub-core/braille/brltty/Bindings/Java/bindings.c
+++ b/grub-core/braille/brltty/Bindings/Java/bindings.c
@@ -0,0 +1,809 @@
+/*
+ * libbrlapi - A library providing access to braille terminals for applications.
+ *
+ * Copyright (C) 2006-2012 by
+ *   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+ *   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+ *
+ * libbrlapi comes with ABSOLUTELY NO WARRANTY.
+ *
+ * This is free software, placed under the terms of the
+ * GNU Lesser General Public License, as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any
+ * later version. Please see the file LICENSE-LGPL for details.
+ *
+ * Web Page: http://mielke.cc/brltty/
+ *
+ * This software is maintained by Dave Mielke <dave@mielke.cc>.
+ */
+
+#include <jni.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#define BRLAPI_NO_DEPRECATED
+#define BRLAPI_NO_SINGLE_SESSION
+#include "brlapi.h"
+
+#define ERR_NULLPTR 0
+#define ERR_OUTOFMEM 1
+#define ERR_INDEX 2
+
+/* TODO: threads */
+static JNIEnv *env;
+
+static void ThrowException(JNIEnv *jenv, int code, const char *msg) {
+  jclass excep;
+  const char *exception;
+
+  switch (code) {
+    case ERR_NULLPTR:  exception = "java/lang/NullPointerException";      break;
+    case ERR_OUTOFMEM: exception = "java/lang/OutOfMemoryError";          break;
+    case ERR_INDEX:    exception = "java/lang/IndexOutOfBoundsException"; break;
+    default:           exception = "java/lang/UnknownError";              break;
+  }
+
+  (*jenv)->ExceptionClear(jenv);
+  excep = (*jenv)->FindClass(jenv, exception);
+  if (excep)
+    (*jenv)->ThrowNew(jenv, excep, msg);
+  else
+    fprintf(stderr,"couldn't find exception %s !\n",exception);
+}
+
+static void ThrowError(JNIEnv *jenv, const char *msg) {
+  const char *error = brlapi_strerror(&brlapi_error);
+  int lenmsg = strlen(msg);
+  int lenerr = strlen(error);
+  jclass jcexcep;
+  jmethodID jinit;
+  jthrowable jexcep;
+  jstring errfun = NULL;
+
+  {
+    char message[lenmsg + 2 + lenerr + 1];
+    snprintf(message, sizeof(message), "%s: %s", msg, error);
+
+    if (!(jcexcep = (*jenv)->FindClass(jenv, "org/a11y/BrlAPI/Error"))) {
+      ThrowException(jenv, ERR_NULLPTR, "ThrowBrlapiErrorFindClass");
+      return;
+    }
+    if (!(jinit = (*jenv)->GetMethodID(jenv, jcexcep, "<init>", "(IIILjava/lang/String;)V"))) {
+      ThrowException(jenv, ERR_NULLPTR, "ThrowBrlapiErrorGetMethodID");
+      return;
+    }
+    if (brlapi_errfun)
+      errfun = (*jenv)->NewStringUTF(jenv, brlapi_errfun);
+    if (!(jexcep = (*jenv)->NewObject(jenv, jcexcep, jinit, brlapi_errno, brlapi_libcerrno, brlapi_gaierrno, errfun))) {
+      ThrowException(jenv, ERR_NULLPTR, "ThrowBrlapiErrorNewObject");
+      return;
+    }
+    (*jenv)->ExceptionClear(jenv);
+    (*jenv)->Throw(jenv, jexcep);
+  }
+}
+
+static void BRLAPI_STDCALL exceptionHandler(brlapi_handle_t *handle, int err, brlapi_packetType_t type, const void *buf, size_t size) {
+  jarray jbuf;
+  jclass jcexcep;
+  jmethodID jinit;
+  jthrowable jexcep;
+
+  if (!(jbuf = (*env)->NewByteArray(env, size))) {
+    ThrowException(env, ERR_OUTOFMEM, __func__);
+    return;
+  }
+  (*env)->SetByteArrayRegion(env, jbuf, 0, size, (jbyte *) buf);
+
+  if (!(jcexcep = (*env)->FindClass(env, "org/a11y/BrlAPI/Exception"))) {
+    ThrowException(env, ERR_NULLPTR, "exceptionHandlerFindClass");
+    return;
+  }
+  if (!(jinit = (*env)->GetMethodID(env, jcexcep, "<init>", "(JII[B)V"))) {
+    ThrowException(env, ERR_NULLPTR, "exceptionHandlerGetMethodID");
+    return;
+  }
+  if (!(jexcep = (*env)->NewObject(env, jcexcep, jinit, (jlong)(intptr_t) handle, err, type, jbuf))) {
+    ThrowException(env, ERR_NULLPTR, "exceptionHandlerNewObject");
+    return;
+  }
+  (*env)->ExceptionClear(env);
+  (*env)->Throw(env, jexcep);
+  return;
+}
+
+#define GET_CLASS(jenv, class, obj, ret) \
+  if (!((class) = (*(jenv))->GetObjectClass((jenv), (obj)))) { \
+    ThrowException((jenv), ERR_NULLPTR, #obj " -> " #class); \
+    return ret; \
+  }
+#define GET_ID(jenv, id, class, field, sig, ret) \
+  if (!((id) = (*(jenv))->GetFieldID((jenv), (class), (field), (sig)))) {\
+    ThrowException((jenv), ERR_NULLPTR, #class "." field); \
+    return ret; \
+  }
+#define GET_HANDLE(jenv, jobj, ret) \
+  brlapi_handle_t *handle; \
+  jclass jcls; \
+  jfieldID handleID; \
+  GET_CLASS(jenv, jcls, jobj, ret); \
+  GET_ID(jenv, handleID, jcls, "handle", "J", ret); \
+  handle = (void*) (intptr_t) (*jenv)->GetLongField(jenv, jobj, handleID); \
+  if (!handle) { \
+    ThrowException((jenv), ERR_NULLPTR, "connection has been closed"); \
+    return ret; \
+  }
+
+JNIEXPORT jint JNICALL Java_org_a11y_BrlAPI_Native_openConnection(JNIEnv *jenv, jobject jobj, jobject JclientSettings , jobject JusedSettings) {
+  jclass jcclientSettings, jcusedSettings;
+  jfieldID clientAuthID = NULL, clientHostID = NULL, usedAuthID, usedHostID;
+  brlapi_connectionSettings_t clientSettings,  usedSettings,
+            *PclientSettings, *PusedSettings;
+  int result;
+  jstring auth = NULL, host = NULL;
+  const char *str;
+  jfieldID handleID;
+  brlapi_handle_t *handle;
+  jclass jcls;
+
+  GET_CLASS(jenv, jcls, jobj, -1);
+  GET_ID(jenv, handleID, jcls, "handle", "J", -1);
+  handle = malloc(brlapi_getHandleSize());
+  if (!handle) {
+    ThrowException(jenv, ERR_OUTOFMEM, __func__);
+    return -1;
+  }
+
+  (*jenv)->SetLongField(jenv, jobj, handleID, (jlong) (intptr_t) handle);
+
+  env = jenv;
+
+  if (JclientSettings) {
+    GET_CLASS(jenv, jcclientSettings, JclientSettings, -1);
+    GET_ID(jenv, clientAuthID, jcclientSettings, "auth", "Ljava/lang/String;", -1);
+    GET_ID(jenv, clientHostID, jcclientSettings, "host", "Ljava/lang/String;", -1);
+
+    PclientSettings = &clientSettings;
+    if ((auth = (*jenv)->GetObjectField(jenv, JclientSettings, clientAuthID))) {
+      if (!(clientSettings.auth = (char *)(*jenv)->GetStringUTFChars(jenv, auth, NULL))) {
+	ThrowException(jenv, ERR_OUTOFMEM, __func__);
+	return -1;
+      }
+    } else clientSettings.auth = NULL;
+    if ((host = (*jenv)->GetObjectField(jenv, JclientSettings, clientHostID))) {
+      if (!(clientSettings.host = (char *)(*jenv)->GetStringUTFChars(jenv, host, NULL))) {
+	ThrowException(jenv, ERR_OUTOFMEM, __func__);
+	return -1;
+      }
+    } else clientSettings.host = NULL;
+  } else PclientSettings = NULL;
+
+  if (JusedSettings)
+    PusedSettings = &usedSettings;
+  else
+    PusedSettings = NULL;
+
+  if ((result = brlapi__openConnection(handle, PclientSettings, PusedSettings)) < 0) {
+    ThrowError(jenv, __func__);
+    return -1;
+  }
+
+  (void) brlapi__setExceptionHandler(handle, exceptionHandler);
+
+  if (JclientSettings) {
+    if (clientSettings.auth)
+      (*jenv)->ReleaseStringUTFChars(jenv, auth,  clientSettings.auth); 
+    if (clientSettings.host)
+      (*jenv)->ReleaseStringUTFChars(jenv, host, clientSettings.host); 
+  }
+
+  if (PusedSettings) {
+    GET_CLASS(jenv, jcusedSettings, JusedSettings, -1);
+    GET_ID(jenv, usedAuthID, jcusedSettings, "auth", "Ljava/lang/String;", -1);
+    GET_ID(jenv, usedHostID, jcusedSettings, "host", "Ljava/lang/String;", -1);
+
+    auth = (*jenv)->NewStringUTF(jenv, usedSettings.auth);
+    if (!auth) {
+      ThrowException(jenv, ERR_OUTOFMEM, __func__);
+      return -1;
+    }
+    str = (*jenv)->GetStringUTFChars(jenv, auth, NULL);
+    (*jenv)->SetObjectField(jenv, JusedSettings, clientAuthID, auth);
+    (*jenv)->ReleaseStringUTFChars(jenv, auth, str);
+
+    host = (*jenv)->NewStringUTF(jenv, usedSettings.host);
+    if (!host) {
+      ThrowException(jenv, ERR_OUTOFMEM, __func__);
+      return -1;
+    }
+    str = (*jenv)->GetStringUTFChars(jenv, host, NULL);
+    (*jenv)->SetObjectField(jenv, JusedSettings, clientHostID, host);
+    (*jenv)->ReleaseStringUTFChars(jenv, host, str);
+  }
+
+  return (jint) result;
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_closeConnection(JNIEnv *jenv, jobject jobj) {
+  env = jenv;
+  GET_HANDLE(jenv, jobj, );
+
+  brlapi__closeConnection(handle);
+  free((void*) (intptr_t) handle);
+  (*jenv)->SetLongField(jenv, jobj, handleID, (jlong) (intptr_t) NULL);
+}
+
+JNIEXPORT jstring JNICALL Java_org_a11y_BrlAPI_Native_getDriverName(JNIEnv *jenv, jobject jobj) {
+  char name[32];
+  GET_HANDLE(jenv, jobj, NULL);
+
+  env = jenv;
+
+  if (brlapi__getDriverName(handle, name, sizeof(name)) < 0) {
+    ThrowError(jenv, __func__);
+    return NULL;
+  }
+
+  name[sizeof(name)-1] = 0;
+  return (*jenv)->NewStringUTF(jenv, name);
+}
+
+JNIEXPORT jobject JNICALL Java_org_a11y_BrlAPI_Native_getDisplaySize(JNIEnv *jenv, jobject jobj) {
+  unsigned int x, y;
+  jclass jcsize;
+  jmethodID jinit;
+  jobject jsize;
+  GET_HANDLE(jenv, jobj, NULL);
+
+  env = jenv;
+
+  if (brlapi__getDisplaySize(handle, &x, &y) < 0) {
+    ThrowError(jenv, __func__);
+    return NULL;
+  }
+
+  if (!(jcsize = (*jenv)->FindClass(jenv, "org/a11y/BrlAPI/DisplaySize"))) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return NULL;
+  }
+  if (!(jinit = (*jenv)->GetMethodID(jenv, jcsize, "<init>", "(II)V"))) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return NULL;
+  }
+  if (!(jsize = (*jenv)->NewObject(jenv, jcsize, jinit, x, y))) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return NULL;
+  }
+
+  return jsize;
+}
+
+JNIEXPORT jint JNICALL Java_org_a11y_BrlAPI_Native_enterTtyMode(JNIEnv *jenv, jobject jobj, jint jtty, jstring jdriver) {
+  int tty ;
+  char *driver;
+  int result;
+  GET_HANDLE(jenv, jobj, -1);
+  
+  env = jenv;
+
+  tty = (int)jtty; 
+  if (!jdriver)
+    driver = NULL;
+  else
+    if (!(driver = (char *)(*jenv)->GetStringUTFChars(jenv, jdriver, NULL))) {
+      ThrowException(jenv, ERR_OUTOFMEM, __func__);
+      return -1;
+    }
+
+  result = brlapi__enterTtyMode(handle, tty,driver);
+  if (result < 0) {
+    ThrowError(jenv, __func__);
+    return -1;
+  }
+
+  return (jint) result;
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_enterTtyModeWithPath(JNIEnv *jenv, jobject jobj, jintArray jttys, jstring jdriver) {
+  jint *ttys ;
+  char *driver;
+  int result;
+  GET_HANDLE(jenv, jobj, );
+  
+  env = jenv;
+
+  if (!jttys) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return;
+  }
+  if (!(ttys = (*jenv)->GetIntArrayElements(jenv, jttys, NULL))) {
+    ThrowException(jenv, ERR_OUTOFMEM, __func__);
+    return;
+  }
+
+  if (!jdriver) {
+    driver = NULL;
+  } else if (!(driver = (char *)(*jenv)->GetStringUTFChars(jenv, jdriver, NULL))) {
+    ThrowException(jenv, ERR_OUTOFMEM, __func__);
+    return;
+  }
+
+  result = brlapi__enterTtyModeWithPath(handle, ttys,(*jenv)->GetArrayLength(jenv,jttys),driver);
+  (*jenv)->ReleaseIntArrayElements(jenv, jttys, ttys, JNI_ABORT);
+  if (result < 0) {
+    ThrowError(jenv, __func__);
+    return;
+  }
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_leaveTtyMode(JNIEnv *jenv, jobject jobj) {
+  env = jenv;
+  GET_HANDLE(jenv, jobj, );
+
+  if (brlapi__leaveTtyMode(handle) < 0) {
+    ThrowError(jenv, __func__);
+    return;
+  }
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_setFocus(JNIEnv *jenv, jobject jobj, jint jarg1) {
+  int arg1 ;
+  GET_HANDLE(jenv, jobj, );
+  
+  env = jenv;
+
+  arg1 = (int)jarg1; 
+  if (brlapi__setFocus(handle, arg1) < 0) {
+    ThrowError(jenv, __func__);
+    return;
+  }
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_writeTextNative(JNIEnv *jenv, jobject jobj, jint jarg1, jstring jarg2) {
+  brlapi_writeArguments_t s = BRLAPI_WRITEARGUMENTS_INITIALIZER;
+  int result;
+  GET_HANDLE(jenv, jobj, );
+  
+  env = jenv;
+
+  s.cursor = (int)jarg1; 
+
+  if (jarg2) {
+    s.regionBegin = 1;
+    s.regionSize = (*jenv)->GetStringLength(jenv, jarg2);
+
+    if (!(s.text = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, NULL))) {
+      ThrowException(jenv, ERR_OUTOFMEM, __func__);
+      return;
+    }
+    s.charset = "UTF-8";
+  }
+
+  result = brlapi__write(handle, &s);
+  if (jarg2)
+    (*jenv)->ReleaseStringUTFChars(jenv, jarg2, s.text); 
+
+  if (result < 0) {
+    ThrowError(jenv, __func__);
+    return;
+  }
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_writeDots(JNIEnv *jenv, jobject jobj, jbyteArray jarg1) {
+  jbyte *arg1;
+  int result;
+  GET_HANDLE(jenv, jobj, );
+  
+  env = jenv;
+
+  if (!jarg1) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return;
+  }
+  arg1 = (*jenv)->GetByteArrayElements(jenv, jarg1, NULL);
+  if (!arg1) {
+    ThrowException(jenv, ERR_OUTOFMEM, __func__);
+    return;
+  }
+
+  result = brlapi__writeDots(handle, (const unsigned char *)arg1);
+  (*jenv)->ReleaseByteArrayElements(jenv, jarg1, arg1, JNI_ABORT); 
+  
+  if (result < 0) {
+    ThrowError(jenv, __func__);
+    return;
+  }
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_write(JNIEnv *jenv, jobject jobj, jobject jarguments) {
+  brlapi_writeArguments_t arguments = BRLAPI_WRITEARGUMENTS_INITIALIZER;
+  int result;
+  jstring text, andMask, orMask;
+  jclass jcwriteArguments;
+  jfieldID displayNumberID, regionBeginID, regionSizeID,
+	   textID, andMaskID, orMaskID, cursorID; 
+  GET_HANDLE(jenv, jobj, );
+
+  env = jenv;
+
+  if (!jarguments) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return;
+  }
+
+  GET_CLASS(jenv, jcwriteArguments, jarguments,);
+
+  GET_ID(jenv, displayNumberID,jcwriteArguments, "displayNumber", "I",);
+  GET_ID(jenv, regionBeginID,  jcwriteArguments, "regionBegin",   "I",);
+  GET_ID(jenv, regionSizeID,   jcwriteArguments, "regionSize",    "I",);
+  GET_ID(jenv, textID,         jcwriteArguments, "text",          "Ljava/lang/String;",);
+  GET_ID(jenv, andMaskID,      jcwriteArguments, "andMask",       "[B",);
+  GET_ID(jenv, orMaskID,       jcwriteArguments, "orMask",        "[B",);
+  GET_ID(jenv, cursorID,       jcwriteArguments, "cursor",        "I",);
+
+  arguments.displayNumber = (*jenv)->GetIntField(jenv, jarguments, displayNumberID);
+  arguments.regionBegin   = (*jenv)->GetIntField(jenv, jarguments, regionBeginID);
+  arguments.regionSize    = (*jenv)->GetIntField(jenv, jarguments, regionSizeID);
+  if ((text  = (*jenv)->GetObjectField(jenv, jarguments, textID)))
+    arguments.text   = (char *)(*jenv)->GetStringUTFChars(jenv, text, NULL);
+  else 
+    arguments.text  = NULL;
+  if ((andMask = (*jenv)->GetObjectField(jenv, jarguments, andMaskID)))
+    arguments.andMask  = (unsigned char *)(*jenv)->GetByteArrayElements(jenv, andMask, NULL);
+  else
+    arguments.andMask = NULL;
+  if ((orMask  = (*jenv)->GetObjectField(jenv, jarguments, orMaskID)))
+    arguments.orMask   = (unsigned char *)(*jenv)->GetByteArrayElements(jenv, orMask, NULL);
+  else
+    arguments.orMask  = NULL;
+  arguments.cursor     = (*jenv)->GetIntField(jenv, jarguments, cursorID);
+  arguments.charset = "UTF-8";
+
+  result = brlapi__write(handle, &arguments);
+
+  if (text)
+    (*jenv)->ReleaseStringUTFChars(jenv, text, arguments.text); 
+  if (andMask)
+    (*jenv)->ReleaseByteArrayElements(jenv, andMask, (jbyte*) arguments.andMask, JNI_ABORT); 
+  if (orMask)
+    (*jenv)->ReleaseByteArrayElements(jenv, orMask,  (jbyte*) arguments.orMask,  JNI_ABORT); 
+
+  if (result < 0) {
+    ThrowError(jenv, __func__);
+    return;
+  }
+}
+
+JNIEXPORT jlong JNICALL Java_org_a11y_BrlAPI_Native_readKey(JNIEnv *jenv, jobject jobj, jboolean jblock) {
+  brlapi_keyCode_t code;
+  int result;
+  GET_HANDLE(jenv, jobj, -1);
+
+  env = jenv;
+
+  result = brlapi__readKey(handle, (int) jblock, &code);
+
+  if (result < 0) {
+    ThrowError(jenv, __func__);
+    return -1;
+  }
+
+  if (!result) return (jlong)(-1);
+  return (jlong)code;
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_ignoreKeys(JNIEnv *jenv, jobject jobj, jlong jrange, jlongArray js) {
+  jlong *s;
+  unsigned int n;
+  int result;
+  GET_HANDLE(jenv, jobj, );
+
+  env = jenv;
+
+  if (!js) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return;
+  }
+
+  n = (unsigned int) (*jenv)->GetArrayLength(jenv, js);
+  s = (*jenv)->GetLongArrayElements(jenv, js, NULL);
+
+  // XXX jlong != brlapi_keyCode_t probably
+  result = brlapi__ignoreKeys(handle, jrange, (const brlapi_keyCode_t *)s, n);
+  (*jenv)->ReleaseLongArrayElements(jenv, js, s, JNI_ABORT);
+  
+  if (result < 0) {
+    ThrowError(jenv, __func__);
+    return;
+  }
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_acceptKeys(JNIEnv *jenv, jobject jobj, jlong jrange, jlongArray js) {
+  jlong *s;
+  unsigned int n;
+  int result;
+  GET_HANDLE(jenv, jobj, );
+
+  env = jenv;
+
+  if (!js) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return;
+  }
+
+  n = (unsigned int) (*jenv)->GetArrayLength(jenv, js);
+  s = (*jenv)->GetLongArrayElements(jenv, js, NULL);
+
+  // XXX jlong != brlapi_keyCode_t probably
+  result = brlapi__acceptKeys(handle, jrange, (const brlapi_keyCode_t *)s, n);
+  (*jenv)->ReleaseLongArrayElements(jenv, js, s, JNI_ABORT);
+
+  if (result < 0) {
+    ThrowError(jenv, __func__);
+    return;
+  }
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_ignoreAllKeys(JNIEnv *jenv, jobject jobj) {
+  GET_HANDLE(jenv, jobj, );
+
+  if (brlapi__ignoreAllKeys(handle) < 0)
+    ThrowError(jenv, __func__);
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_acceptAllKeys(JNIEnv *jenv, jobject jobj) {
+  GET_HANDLE(jenv, jobj, );
+
+  if (brlapi__acceptAllKeys(handle) < 0)
+    ThrowError(jenv, __func__);
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_ignoreKeyRanges(JNIEnv *jenv, jobject jobj, jobjectArray js) {
+  unsigned int n;
+  GET_HANDLE(jenv, jobj, );
+
+  env = jenv;
+
+  if (!js) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return;
+  }
+
+  n = (unsigned int) (*jenv)->GetArrayLength(jenv, js);
+
+  {
+    unsigned int i;
+    brlapi_range_t s[n];
+
+    for (i=0; i<n; i++) {
+      jlongArray jl = (*jenv)->GetObjectArrayElement(jenv, js, i);
+      jlong *l = (*jenv)->GetLongArrayElements(jenv, jl, NULL);
+      s[i].first = l[0];
+      s[i].last = l[1];
+      (*jenv)->ReleaseLongArrayElements(jenv, jl, l, JNI_ABORT);
+    }
+    if (brlapi__ignoreKeyRanges(handle, s, n)) {
+      ThrowError(jenv, __func__);
+      return;
+    }
+  }
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_acceptKeyRanges(JNIEnv *jenv, jobject jobj, jobjectArray js) {
+  unsigned int n;
+  GET_HANDLE(jenv, jobj, );
+
+  env = jenv;
+
+  if (!js) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return;
+  }
+
+  n = (unsigned int) (*jenv)->GetArrayLength(jenv, js);
+
+  {
+    unsigned int i;
+    brlapi_range_t s[n];
+
+    for (i=0; i<n; i++) {
+      jlongArray jl = (*jenv)->GetObjectArrayElement(jenv, js, i);
+      jlong *l = (*jenv)->GetLongArrayElements(jenv, jl, NULL);
+      s[i].first = l[0];
+      s[i].last = l[1];
+      (*jenv)->ReleaseLongArrayElements(jenv, jl, l, JNI_ABORT);
+    }
+    if (brlapi__acceptKeyRanges(handle, s, n)) {
+      ThrowError(jenv, __func__);
+      return;
+    }
+  }
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_enterRawMode(JNIEnv *jenv, jobject jobj, jstring jdriver) {
+  env = jenv;
+  char *driver;
+  int res;
+  GET_HANDLE(jenv, jobj, );
+
+  if (!jdriver) {
+    driver = NULL;
+  } else if (!(driver = (char *)(*jenv)->GetStringUTFChars(jenv, jdriver, NULL))) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return;
+  }
+  res = brlapi__enterRawMode(handle, driver);
+  if (jdriver) (*jenv)->ReleaseStringUTFChars(jenv, jdriver, driver);
+  if (res < 0) {
+    ThrowError(jenv, __func__);
+    return;
+  }
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Native_leaveRawMode(JNIEnv *jenv, jobject jobj) {
+  env = jenv;
+  GET_HANDLE(jenv, jobj, );
+
+  if (brlapi__leaveRawMode(handle) < 0) {
+    ThrowError(jenv, __func__);
+    return;
+  }
+}
+
+JNIEXPORT jint JNICALL Java_org_a11y_BrlAPI_Native_sendRaw(JNIEnv *jenv, jobject jobj, jbyteArray jbuf) {
+  jbyte *buf;
+  unsigned int n;
+  int result;
+  GET_HANDLE(jenv, jobj, -1);
+
+  env = jenv;
+
+  if (!jbuf) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return -1;
+  }
+
+  n = (unsigned int) (*jenv)->GetArrayLength(jenv, jbuf);
+  buf = (*jenv)->GetByteArrayElements(jenv, jbuf, NULL);
+
+  result = brlapi__sendRaw(handle, (const unsigned char *)buf, n);
+  (*jenv)->ReleaseByteArrayElements(jenv, jbuf, buf, JNI_ABORT);
+
+  if (result < 0) {
+    ThrowError(jenv, __func__);
+    return -1;
+  }
+
+  return (jint) result;
+}
+
+JNIEXPORT jint JNICALL Java_org_a11y_BrlAPI_Native_recvRaw(JNIEnv *jenv, jobject jobj, jbyteArray jbuf) {
+  jbyte *buf;
+  unsigned int n;
+  int result;
+  GET_HANDLE(jenv, jobj, -1);
+
+  env = jenv;
+
+  if (!jbuf) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return -1;
+  }
+
+  n = (unsigned int) (*jenv)->GetArrayLength(jenv, jbuf);
+  buf = (*jenv)->GetByteArrayElements(jenv, jbuf, NULL);
+
+  result = brlapi__recvRaw(handle, (unsigned char *)buf, n);
+
+  if (result < 0) {
+    (*jenv)->ReleaseByteArrayElements(jenv, jbuf, buf, JNI_ABORT);
+    ThrowError(jenv, __func__);
+    return -1;
+  }
+
+  (*jenv)->ReleaseByteArrayElements(jenv, jbuf, buf, 0);
+  return (jint) result;
+}
+
+JNIEXPORT jstring JNICALL Java_org_a11y_BrlAPI_Native_getPacketTypeName(JNIEnv *jenv, jclass jcls, jlong jtype) {
+  const char *type;
+
+  env = jenv;
+
+  if (!(type = brlapi_getPacketTypeName((brlapi_packetType_t) jtype))) {
+    ThrowError(jenv, __func__);
+    return NULL;
+  }
+
+  return (*jenv)->NewStringUTF(jenv, type);
+}
+
+JNIEXPORT jstring JNICALL Java_org_a11y_BrlAPI_Error_toString (JNIEnv *jenv, jobject jerr) {
+  jclass jcerr;
+  jfieldID brlerrnoID, libcerrnoID, gaierrnoID, errfunID;
+  jstring jerrfun;
+  brlapi_error_t error;
+  const char *res;
+
+  env = jenv;
+
+  GET_CLASS(jenv, jcerr, jerr, NULL);
+  GET_ID(jenv, brlerrnoID,  jcerr, "brlerrno",  "I", NULL);
+  GET_ID(jenv, libcerrnoID, jcerr, "libcerrno", "I", NULL);
+  GET_ID(jenv, gaierrnoID,  jcerr, "gaierrno",  "I", NULL);
+  GET_ID(jenv, errfunID,    jcerr, "errfun",    "Ljava/lang/String;", NULL);
+
+  error.brlerrno  = (*jenv)->GetIntField(jenv, jerr, brlerrnoID);
+  error.libcerrno = (*jenv)->GetIntField(jenv, jerr, libcerrnoID);
+  error.gaierrno  = (*jenv)->GetIntField(jenv, jerr, gaierrnoID);
+  if (!(jerrfun = (*jenv)->GetObjectField(jenv, jerr, errfunID))) {
+    error.errfun = NULL;
+  } else if (!(error.errfun = (char *)(*jenv)->GetStringUTFChars(jenv, jerrfun, NULL))) {
+    ThrowException(jenv, ERR_OUTOFMEM, __func__);
+    return NULL;
+  }
+  res = brlapi_strerror(&error);
+  if (jerrfun)
+    (*jenv)->ReleaseStringUTFChars(jenv, jerrfun, error.errfun);
+  return (*jenv)->NewStringUTF(jenv, res);
+}
+
+JNIEXPORT jstring JNICALL Java_org_a11y_BrlAPI_Exception_toString (JNIEnv *jenv, jobject jerr) {
+  jclass jcerr;
+  jfieldID handleID, errnoID, typeID, bufID;
+  jarray jbuf;
+  brlapi_handle_t *handle;
+  int errno;
+  long type;
+  jbyte *buf;
+  int size;
+  char errmsg[256];
+  brlapi_error_t error;
+
+  env = jenv;
+
+  if (!jerr) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return NULL;
+  }
+  GET_CLASS(jenv, jcerr, jerr, NULL);
+  GET_ID(jenv, handleID, jcerr, "handle", "I", NULL);
+  GET_ID(jenv, errnoID,  jcerr, "errno",  "I", NULL);
+  GET_ID(jenv, typeID,   jcerr, "type",   "I", NULL);
+  GET_ID(jenv, bufID,    jcerr, "buf",    "I", NULL);
+
+  handle = (void*)(intptr_t)(*jenv)->GetLongField(jenv, jerr, handleID);
+  error.brlerrno = (*jenv)->GetIntField(jenv, jerr, errnoID);
+  type  = (*jenv)->GetIntField(jenv, jerr, typeID);
+  if (!(jbuf  = (*jenv)->GetObjectField(jenv, jerr, typeID))) {
+    ThrowException(jenv, ERR_NULLPTR, __func__);
+    return NULL;
+  }
+  size  = (*jenv)->GetArrayLength(jenv, jbuf);
+  buf = (*jenv)->GetByteArrayElements(jenv, jbuf, NULL);
+
+  brlapi__strexception(handle, errmsg, sizeof(errmsg), errno, type, buf, size); 
+
+  return (*jenv)->NewStringUTF(jenv, errmsg);
+}
+
+JNIEXPORT void JNICALL Java_org_a11y_BrlAPI_Key_expandKeyCode (JNIEnv *jenv, jobject obj, jlong jkey) {
+  jclass jckey;
+  jfieldID typeID, commandID, argumentID, flagsID;
+  brlapi_keyCode_t key = jkey;
+  brlapi_expandedKeyCode_t ekc;
+
+  GET_CLASS(jenv, jckey, obj, );
+  GET_ID(jenv, typeID,     jckey, "type",     "I", );
+  GET_ID(jenv, commandID,  jckey, "command",  "I", );
+  GET_ID(jenv, argumentID, jckey, "argument", "I", );
+  GET_ID(jenv, flagsID,    jckey, "flags",    "I", );
+
+  brlapi_expandKeyCode(key, &ekc);
+  (*jenv)->SetIntField(jenv, obj, typeID,     ekc.type);
+  (*jenv)->SetIntField(jenv, obj, commandID,  ekc.command);
+  (*jenv)->SetIntField(jenv, obj, argumentID, ekc.argument);
+  (*jenv)->SetIntField(jenv, obj, flagsID,    ekc.flags);
+}
--- a/grub-core/braille/brltty/Bindings/Java/bindings.m4
+++ b/grub-core/braille/brltty/Bindings/Java/bindings.m4
@@ -0,0 +1,110 @@
+###############################################################################
+# libbrlapi - A library providing access to braille terminals for applications.
+#
+# Copyright (C) 2006-2012 by
+#   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+#   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+#
+# libbrlapi comes with ABSOLUTELY NO WARRANTY.
+#
+# This is free software, placed under the terms of the
+# GNU Lesser General Public License, as published by the Free Software
+# Foundation; either version 2.1 of the License, or (at your option) any
+# later version. Please see the file LICENSE-LGPL for details.
+#
+# Web Page: http://mielke.cc/brltty/
+#
+# This software is maintained by Dave Mielke <dave@mielke.cc>.
+###############################################################################
+
+AC_DEFUN([BRLTTY_JAVA_BINDINGS], [dnl
+if test -n "${JAVA_HOME}"
+then
+   BRLTTY_JAVA_COMPILER([javac], ["${JAVA_HOME}/bin"])
+else
+   BRLTTY_JAVA_COMPILER([javac], [], [dnl
+      BRLTTY_JAVA_COMPILER([javac], [/usr/java/bin /usr/java/jdk*/bin], [dnl
+         BRLTTY_JAVA_COMPILER([gcj])
+      ])
+   ])
+fi
+
+JAVA_OK=false
+if test -n "${JAVAC_PATH}"
+then
+   AC_MSG_NOTICE([Java compiler is ${JAVAC_PATH}])
+   JAVA_OK=true
+
+   JAVA_ENCODING="UTF-8"
+   case "${JAVAC_NAME}"
+   in
+      javac) JAVAC_OPTIONS="-encoding ${JAVA_ENCODING}";;
+      gcj)   JAVAC_OPTIONS="-C --encoding=${JAVA_ENCODING}";;
+      *)     JAVAC_OPTIONS="";;
+   esac
+   AC_SUBST([JAVAC], ["${JAVAC_PATH} ${JAVAC_OPTIONS}"])
+
+   JAVA_BIN=`AS_DIRNAME("${JAVAC_PATH}")`
+   JAVA_ROOT=`AS_DIRNAME("${JAVA_BIN}")`
+
+   AC_CHECK_PROGS([JAVADOC_NAME], [javadoc gjdoc], [], ["${JAVA_BIN}"])
+   if test -n "${JAVADOC_NAME}"
+   then
+      JAVADOC_PATH="${JAVA_BIN}/${JAVADOC_NAME}"
+   else
+      JAVADOC_PATH=":"
+   fi
+   AC_SUBST([JAVADOC], ["${JAVADOC_PATH} -encoding ${JAVA_ENCODING}"])
+
+   AC_CHECK_PROGS([JAR_NAME], [jar gjar], [JAR_NOT_FOUND_BY_CONFIGURE], ["${JAVA_BIN}"])
+   AC_SUBST([JAR], ["${JAVA_BIN}/${JAR_NAME}"])
+   BRLTTY_JAVA_DIRECTORY([JAR], [/usr/share/java])
+
+   JAVA_JNI_INC="${JAVA_ROOT}/include"
+   JAVA_JNI_HDR="jni.h"
+   JAVA_JNI_FLAGS=""
+   AC_CHECK_HEADER([${JAVA_JNI_HDR}], [], [AC_CHECK_FILE(["${JAVA_JNI_INC}/${JAVA_JNI_HDR}"], [JAVA_JNI_FLAGS="-I${JAVA_JNI_INC}"], [JAVA_OK=false])])
+   AC_SUBST([JAVA_JNI_HDR])
+   AC_SUBST([JAVA_JNI_INC])
+   AC_SUBST([JAVA_JNI_FLAGS])
+   BRLTTY_JAVA_DIRECTORY([JNI], [/usr/lib/java /usr/lib/jni])
+else
+   AC_MSG_WARN([Java compiler not found])
+fi
+
+AC_SUBST([JAVA_OK])
+])
+
+AC_DEFUN([BRLTTY_JAVA_COMPILER], [dnl
+AC_PATH_PROG([JAVAC_PATH], [$1], [], [$2])
+if test -n "${JAVAC_PATH}"
+then
+   JAVAC_NAME="$1"
+ifelse(len([$3]), 0, [], [dnl
+else
+   $3
+])dnl
+fi])
+
+AC_DEFUN([BRLTTY_JAVA_DIRECTORY], [dnl
+JAVA_$1_DIR=""
+for directory in $2
+do
+   test -d "${directory}" && {
+      JAVA_$1_DIR="${directory}"
+      break
+   }
+done
+
+if test -n "${JAVA_$1_DIR}"
+then
+   JAVA_$1="yes"
+   AC_MSG_NOTICE([Java] m4_tolower([$1]) [installation directory is ${JAVA_$1_DIR}])
+else
+   JAVA_$1="no"
+   AC_MSG_WARN([no commonly used] m4_tolower([$1]) [installation directory])
+fi
+
+AC_SUBST([JAVA_$1])
+AC_SUBST([JAVA_$1_DIR])
+])
--- a/grub-core/braille/brltty/Bindings/Java/constants.awk
+++ b/grub-core/braille/brltty/Bindings/Java/constants.awk
@@ -0,0 +1,121 @@
+###############################################################################
+# libbrlapi - A library providing access to braille terminals for applications.
+#
+# Copyright (C) 2006-2012 by
+#   Samuel Thibault <Samuel.Thibault@ens-lyon.org>
+#   Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+#
+# libbrlapi comes with ABSOLUTELY NO WARRANTY.
+#
+# This is free software, placed under the terms of the
+# GNU Lesser General Public License, as published by the Free Software
+# Foundation; either version 2.1 of the License, or (at your option) any
+# later version. Please see the file LICENSE-LGPL for details.
+#
+# Web Page: http://mielke.cc/brltty/
+#
+# This software is maintained by Dave Mielke <dave@mielke.cc>.
+###############################################################################
+
+BEGIN {
+  print "package org.a11y.BrlAPI;"
+  print ""
+  print "public interface Constants {"
+}
+
+END {
+  print "}"
+}
+
+function brlCommand(name, symbol, value, help) {
+  writeCommandDefinition(name, value, help)
+}
+
+function brlBlock(name, symbol, value, help) {
+  if (name == "PASSCHAR") return
+  if (name == "PASSKEY") return
+
+  if (value ~ /^0[xX][0-9a-fA-F]+00$/) {
+    writeCommandDefinition(name, hexadecimalValue(value) "00", help)
+  }
+}
+
+function brlKey(name, symbol, value, help) {
+}
+
+function brlFlag(name, symbol, value, help) {
+  if (value ~ /^0[xX][0-9a-fA-F]+0000$/) {
+    value = hexadecimalValue(substr(value, 1, length(value)-4))
+    if (name ~ /^CHAR_/) {
+      name = substr(name, 6)
+    } else {
+      value = value "00"
+    }
+  } else if (value ~ /^\(/) {
+    gsub("BRL_FLG_", "KEY_FLG_", value)
+  } else {
+    return
+  }
+  writeJavaConstant("int", "KEY_FLG_" name, value, help)
+}
+
+function brlDot(number, symbol, value, help) {
+  writeJavaConstant("byte", "DOT" number, "(byte) (" value ")", help)
+}
+
+function apiConstant(name, symbol, value, help) {
+  writeJavaConstant("int", name, value);
+}
+
+function apiMask(name, symbol, value, help) {
+  writeJavaConstant("long", "KEY_" name, hexadecimalValue(value) "L");
+}
+
+function apiShift(name, symbol, value, help) {
+  writeJavaConstant("int", "KEY_" name, hexadecimalValue(value));
+}
+
+function apiType(name, symbol, value, help) {
+  writeJavaConstant("int", "KEY_TYPE_" name, hexadecimalValue(value));
+}
+
+function apiKey(name, symbol, value, help) {
+  value = hexadecimalValue(value)
+
+  if (name == "FUNCTION") {
+    for (i=0; i<35; ++i) {
+      writeKeyDefinition("F" (i+1), "(" value " + " i ")")
+    }
+  } else {
+    writeKeyDefinition(name, value)
+  }
+}
+
+function apiRangeType(name, symbol, value, help) {
+  writeJavaConstant("int", "rangeType_" name, value, help)
+}
+
+function writeCommandDefinition(name, value, help) {
+  writeJavaConstant("int", "KEY_CMD_" name, value, help)
+}
+
+function writeKeyDefinition(name, value) {
+  writeJavaConstant("int", "KEY_SYM_" name, value)
+}
+
+function writeJavaConstant(type, name, value, help) {
+  writeJavadocComment(help)
+  print "  " type " " name " = " value ";"
+}
+
+function writeJavadocComment(text) {
+  if (length(text) > 0) print "  /** " text " */"
+}
+
+function hexadecimalValue(value) {
+  value = tolower(value)
+  gsub("x0+", "x", value)
+  gsub("x$", "x0", value)
+  return value
+}
+
--- a/grub-core/braille/brltty/Bindings/Java/doc/allclasses-frame.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/allclasses-frame.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+All Classes
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
+
+
+</HEAD>
+
+<BODY BGCOLOR="white">
+<FONT size="+1" CLASS="FrameHeadingFont">
+<B>All Classes</B></FONT>
+<BR>
+
+<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+<TR>
+<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="org/a11y/BrlAPI/Brlapi.html" title="class in org.a11y.BrlAPI" target="classFrame">Brlapi</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI" target="classFrame">ConnectionSettings</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI" target="classFrame"><I>Constants</I></A>
+<BR>
+<A HREF="org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI" target="classFrame">DisplaySize</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI" target="classFrame">Error</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/Exception.html" title="class in org.a11y.BrlAPI" target="classFrame">Exception</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/Key.html" title="class in org.a11y.BrlAPI" target="classFrame">Key</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI" target="classFrame">Native</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/Test.html" title="class in org.a11y.BrlAPI" target="classFrame">Test</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI" target="classFrame">WriteArguments</A>
+<BR>
+</FONT></TD>
+</TR>
+</TABLE>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/allclasses-noframe.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/allclasses-noframe.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+All Classes
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
+
+
+</HEAD>
+
+<BODY BGCOLOR="white">
+<FONT size="+1" CLASS="FrameHeadingFont">
+<B>All Classes</B></FONT>
+<BR>
+
+<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+<TR>
+<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="org/a11y/BrlAPI/Brlapi.html" title="class in org.a11y.BrlAPI">Brlapi</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI"><I>Constants</I></A>
+<BR>
+<A HREF="org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI">DisplaySize</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/Exception.html" title="class in org.a11y.BrlAPI">Exception</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/Key.html" title="class in org.a11y.BrlAPI">Key</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI">Native</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/Test.html" title="class in org.a11y.BrlAPI">Test</A>
+<BR>
+<A HREF="org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI">WriteArguments</A>
+<BR>
+</FONT></TD>
+</TR>
+</TABLE>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/constant-values.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/constant-values.html
--- a/grub-core/braille/brltty/Bindings/Java/doc/deprecated-list.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/deprecated-list.html
@@ -0,0 +1,144 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Deprecated List
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Deprecated List";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="index.html?deprecated-list.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Deprecated API</B></H2>
+</CENTER>
+<HR SIZE="4" NOSHADE>
+<B>Contents</B><UL>
+</UL>
+
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="index.html?deprecated-list.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/help-doc.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/help-doc.html
@@ -0,0 +1,215 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+API Help
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="API Help";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="index.html?help-doc.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H1>
+How This API Document Is Organized</H1>
+</CENTER>
+This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.<H3>
+Package</H3>
+<BLOCKQUOTE>
+
+<P>
+Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:<UL>
+<LI>Interfaces (italic)<LI>Classes<LI>Enums<LI>Exceptions<LI>Errors<LI>Annotation Types</UL>
+</BLOCKQUOTE>
+<H3>
+Class/Interface</H3>
+<BLOCKQUOTE>
+
+<P>
+Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:<UL>
+<LI>Class inheritance diagram<LI>Direct Subclasses<LI>All Known Subinterfaces<LI>All Known Implementing Classes<LI>Class/interface declaration<LI>Class/interface description
+<P>
+<LI>Nested Class Summary<LI>Field Summary<LI>Constructor Summary<LI>Method Summary
+<P>
+<LI>Field Detail<LI>Constructor Detail<LI>Method Detail</UL>
+Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</BLOCKQUOTE>
+</BLOCKQUOTE>
+<H3>
+Annotation Type</H3>
+<BLOCKQUOTE>
+
+<P>
+Each annotation type has its own separate page with the following sections:<UL>
+<LI>Annotation Type declaration<LI>Annotation Type description<LI>Required Element Summary<LI>Optional Element Summary<LI>Element Detail</UL>
+</BLOCKQUOTE>
+</BLOCKQUOTE>
+<H3>
+Enum</H3>
+<BLOCKQUOTE>
+
+<P>
+Each enum has its own separate page with the following sections:<UL>
+<LI>Enum declaration<LI>Enum description<LI>Enum Constant Summary<LI>Enum Constant Detail</UL>
+</BLOCKQUOTE>
+<H3>
+Use</H3>
+<BLOCKQUOTE>
+Each documented package, class and interface has its own Use page.  This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A.  You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.</BLOCKQUOTE>
+<H3>
+Tree (Class Hierarchy)</H3>
+<BLOCKQUOTE>
+There is a <A HREF="overview-tree.html">Class Hierarchy</A> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.<UL>
+<LI>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.<LI>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</UL>
+</BLOCKQUOTE>
+<H3>
+Deprecated API</H3>
+<BLOCKQUOTE>
+The <A HREF="deprecated-list.html">Deprecated API</A> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</BLOCKQUOTE>
+<H3>
+Index</H3>
+<BLOCKQUOTE>
+The <A HREF="index-all.html">Index</A> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</BLOCKQUOTE>
+<H3>
+Prev/Next</H3>
+These links take you to the next or previous class, interface, package, or related page.<H3>
+Frames/No Frames</H3>
+These links show and hide the HTML frames.  All pages are available with or without frames.
+<P>
+<H3>
+Serialized Form</H3>
+Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
+<P>
+<H3>
+Constant Field Values</H3>
+The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.
+<P>
+<FONT SIZE="-1">
+<EM>
+This help file applies to API documentation generated using the standard doclet.</EM>
+</FONT>
+<BR>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="index.html?help-doc.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/index-all.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/index-all.html
--- a/grub-core/braille/brltty/Bindings/Java/doc/index.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/index.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc on Fri Nov 19 06:05:12 CET 2010-->
+<TITLE>
+Generated Documentation (Untitled)
+</TITLE>
+<SCRIPT type="text/javascript">
+    targetPage = "" + window.location.search;
+    if (targetPage != "" && targetPage != "undefined")
+        targetPage = targetPage.substring(1);
+    if (targetPage.indexOf(":") != -1)
+        targetPage = "undefined";
+    function loadFrames() {
+        if (targetPage != "" && targetPage != "undefined")
+             top.classFrame.location = top.targetPage;
+    }
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+</HEAD>
+<FRAMESET cols="20%,80%" title="" onLoad="top.loadFrames()">
+<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
+<FRAME src="org/a11y/BrlAPI/package-summary.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
+<NOFRAMES>
+<H2>
+Frame Alert</H2>
+
+<P>
+This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
+<BR>
+Link to<A HREF="org/a11y/BrlAPI/package-summary.html">Non-frame version.</A>
+</NOFRAMES>
+</FRAMESET>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Brlapi.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Brlapi.html
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/ConnectionSettings.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/ConnectionSettings.html
@@ -0,0 +1,306 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:11 CET 2010 -->
+<TITLE>
+ConnectionSettings
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="ConnectionSettings";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ConnectionSettings.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Brlapi.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/ConnectionSettings.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="ConnectionSettings.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+org.a11y.BrlAPI</FONT>
+<BR>
+Class ConnectionSettings</H2>
+<PRE>
+java.lang.Object
+  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>org.a11y.BrlAPI.ConnectionSettings</B>
+</PRE>
+<HR>
+<DL>
+<DT><PRE>public class <B>ConnectionSettings</B><DT>extends java.lang.Object</DL>
+</PRE>
+
+<P>
+<HR>
+
+<P>
+<!-- =========== FIELD SUMMARY =========== -->
+
+<A NAME="field_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Field Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/ConnectionSettings.html#auth">auth</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/ConnectionSettings.html#host">host</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/ConnectionSettings.html#ConnectionSettings()">ConnectionSettings</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/ConnectionSettings.html#ConnectionSettings(java.lang.String)">ConnectionSettings</A></B>(java.lang.String&nbsp;host)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/ConnectionSettings.html#ConnectionSettings(java.lang.String, java.lang.String)">ConnectionSettings</A></B>(java.lang.String&nbsp;host,
+                   java.lang.String&nbsp;auth)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="host"><!-- --></A><H3>
+host</H3>
+<PRE>
+public java.lang.String <B>host</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="auth"><!-- --></A><H3>
+auth</H3>
+<PRE>
+public java.lang.String <B>auth</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="ConnectionSettings(java.lang.String, java.lang.String)"><!-- --></A><H3>
+ConnectionSettings</H3>
+<PRE>
+public <B>ConnectionSettings</B>(java.lang.String&nbsp;host,
+                          java.lang.String&nbsp;auth)</PRE>
+<DL>
+</DL>
+<HR>
+
+<A NAME="ConnectionSettings(java.lang.String)"><!-- --></A><H3>
+ConnectionSettings</H3>
+<PRE>
+public <B>ConnectionSettings</B>(java.lang.String&nbsp;host)</PRE>
+<DL>
+</DL>
+<HR>
+
+<A NAME="ConnectionSettings()"><!-- --></A><H3>
+ConnectionSettings</H3>
+<PRE>
+public <B>ConnectionSettings</B>()</PRE>
+<DL>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ConnectionSettings.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Brlapi.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/ConnectionSettings.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="ConnectionSettings.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Constants.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Constants.html
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/DisplaySize.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/DisplaySize.html
@@ -0,0 +1,325 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:11 CET 2010 -->
+<TITLE>
+DisplaySize
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="DisplaySize";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/DisplaySize.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/DisplaySize.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="DisplaySize.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+org.a11y.BrlAPI</FONT>
+<BR>
+Class DisplaySize</H2>
+<PRE>
+java.lang.Object
+  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>org.a11y.BrlAPI.DisplaySize</B>
+</PRE>
+<HR>
+<DL>
+<DT><PRE>public class <B>DisplaySize</B><DT>extends java.lang.Object</DL>
+</PRE>
+
+<P>
+<HR>
+
+<P>
+<!-- =========== FIELD SUMMARY =========== -->
+
+<A NAME="field_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Field Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/DisplaySize.html#height">height</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/DisplaySize.html#width">width</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/DisplaySize.html#DisplaySize(int, int)">DisplaySize</A></B>(int&nbsp;width,
+            int&nbsp;height)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/DisplaySize.html#getHeight()">getHeight</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/DisplaySize.html#getWidth()">getWidth</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="width"><!-- --></A><H3>
+width</H3>
+<PRE>
+protected final int <B>width</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="height"><!-- --></A><H3>
+height</H3>
+<PRE>
+protected final int <B>height</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="DisplaySize(int, int)"><!-- --></A><H3>
+DisplaySize</H3>
+<PRE>
+public <B>DisplaySize</B>(int&nbsp;width,
+                   int&nbsp;height)</PRE>
+<DL>
+</DL>
+
+<!-- ============ METHOD DETAIL ========== -->
+
+<A NAME="method_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Method Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="getWidth()"><!-- --></A><H3>
+getWidth</H3>
+<PRE>
+public int <B>getWidth</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getHeight()"><!-- --></A><H3>
+getHeight</H3>
+<PRE>
+public int <B>getHeight</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/DisplaySize.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/DisplaySize.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="DisplaySize.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Error.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Error.html
@@ -0,0 +1,599 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:11 CET 2010 -->
+<TITLE>
+Error
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Error";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Error.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Exception.html" title="class in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/Error.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Error.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+org.a11y.BrlAPI</FONT>
+<BR>
+Class Error</H2>
+<PRE>
+java.lang.Object
+  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">java.lang.Throwable
+      <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">java.lang.Error
+          <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>org.a11y.BrlAPI.Error</B>
+</PRE>
+<DL>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable</DD>
+</DL>
+<HR>
+<DL>
+<DT><PRE>public class <B>Error</B><DT>extends java.lang.Error</DL>
+</PRE>
+
+<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../serialized-form.html#org.a11y.BrlAPI.Error">Serialized Form</A></DL>
+<HR>
+
+<P>
+<!-- =========== FIELD SUMMARY =========== -->
+
+<A NAME="field_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Field Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#CONNREFUSED">CONNREFUSED</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#DEVICEBUSY">DEVICEBUSY</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#DRIVERERROR">DRIVERERROR</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#EMPTYKEY">EMPTYKEY</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#EOF">EOF</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#GAIERR">GAIERR</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#ILLEGAL_INSTRUCTION">ILLEGAL_INSTRUCTION</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#INVALID_PACKET">INVALID_PACKET</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#INVALID_PARAMETER">INVALID_PARAMETER</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#LIBCERR">LIBCERR</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#NOMEM">NOMEM</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#OPNOTSUPP">OPNOTSUPP</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#PROTOCOL_VERSION">PROTOCOL_VERSION</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#SUCCESS">SUCCESS</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#TTYBUSY">TTYBUSY</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#UNKNOWN_INSTRUCTION">UNKNOWN_INSTRUCTION</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#UNKNOWNTTY">UNKNOWNTTY</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#Error(int, int, int, java.lang.String)">Error</A></B>(int&nbsp;brlerrno,
+      int&nbsp;libcerrno,
+      int&nbsp;gaierrno,
+      java.lang.String&nbsp;errfun)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Error.html#toString()">toString</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Throwable"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Throwable</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="SUCCESS"><!-- --></A><H3>
+SUCCESS</H3>
+<PRE>
+public static final int <B>SUCCESS</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.SUCCESS">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="NOMEM"><!-- --></A><H3>
+NOMEM</H3>
+<PRE>
+public static final int <B>NOMEM</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.NOMEM">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="TTYBUSY"><!-- --></A><H3>
+TTYBUSY</H3>
+<PRE>
+public static final int <B>TTYBUSY</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.TTYBUSY">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="DEVICEBUSY"><!-- --></A><H3>
+DEVICEBUSY</H3>
+<PRE>
+public static final int <B>DEVICEBUSY</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.DEVICEBUSY">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="UNKNOWN_INSTRUCTION"><!-- --></A><H3>
+UNKNOWN_INSTRUCTION</H3>
+<PRE>
+public static final int <B>UNKNOWN_INSTRUCTION</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.UNKNOWN_INSTRUCTION">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="ILLEGAL_INSTRUCTION"><!-- --></A><H3>
+ILLEGAL_INSTRUCTION</H3>
+<PRE>
+public static final int <B>ILLEGAL_INSTRUCTION</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.ILLEGAL_INSTRUCTION">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="INVALID_PARAMETER"><!-- --></A><H3>
+INVALID_PARAMETER</H3>
+<PRE>
+public static final int <B>INVALID_PARAMETER</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.INVALID_PARAMETER">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="INVALID_PACKET"><!-- --></A><H3>
+INVALID_PACKET</H3>
+<PRE>
+public static final int <B>INVALID_PACKET</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.INVALID_PACKET">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="CONNREFUSED"><!-- --></A><H3>
+CONNREFUSED</H3>
+<PRE>
+public static final int <B>CONNREFUSED</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.CONNREFUSED">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="OPNOTSUPP"><!-- --></A><H3>
+OPNOTSUPP</H3>
+<PRE>
+public static final int <B>OPNOTSUPP</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.OPNOTSUPP">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="GAIERR"><!-- --></A><H3>
+GAIERR</H3>
+<PRE>
+public static final int <B>GAIERR</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.GAIERR">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="LIBCERR"><!-- --></A><H3>
+LIBCERR</H3>
+<PRE>
+public static final int <B>LIBCERR</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.LIBCERR">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="UNKNOWNTTY"><!-- --></A><H3>
+UNKNOWNTTY</H3>
+<PRE>
+public static final int <B>UNKNOWNTTY</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.UNKNOWNTTY">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="PROTOCOL_VERSION"><!-- --></A><H3>
+PROTOCOL_VERSION</H3>
+<PRE>
+public static final int <B>PROTOCOL_VERSION</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.PROTOCOL_VERSION">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="EOF"><!-- --></A><H3>
+EOF</H3>
+<PRE>
+public static final int <B>EOF</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.EOF">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="EMPTYKEY"><!-- --></A><H3>
+EMPTYKEY</H3>
+<PRE>
+public static final int <B>EMPTYKEY</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.EMPTYKEY">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="DRIVERERROR"><!-- --></A><H3>
+DRIVERERROR</H3>
+<PRE>
+public static final int <B>DRIVERERROR</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.a11y.BrlAPI.Error.DRIVERERROR">Constant Field Values</A></DL>
+</DL>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="Error(int, int, int, java.lang.String)"><!-- --></A><H3>
+Error</H3>
+<PRE>
+public <B>Error</B>(int&nbsp;brlerrno,
+             int&nbsp;libcerrno,
+             int&nbsp;gaierrno,
+             java.lang.String&nbsp;errfun)</PRE>
+<DL>
+</DL>
+
+<!-- ============ METHOD DETAIL ========== -->
+
+<A NAME="method_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Method Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="toString()"><!-- --></A><H3>
+toString</H3>
+<PRE>
+public final java.lang.String <B>toString</B>()</PRE>
+<DL>
+<DD><DL>
+<DT><B>Overrides:</B><DD><CODE>toString</CODE> in class <CODE>java.lang.Throwable</CODE></DL>
+</DD>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Error.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Exception.html" title="class in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/Error.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Error.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Exception.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Exception.html
@@ -0,0 +1,275 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:11 CET 2010 -->
+<TITLE>
+Exception
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Exception";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Exception.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Key.html" title="class in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/Exception.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Exception.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+org.a11y.BrlAPI</FONT>
+<BR>
+Class Exception</H2>
+<PRE>
+java.lang.Object
+  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">java.lang.Throwable
+      <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">java.lang.Exception
+          <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>org.a11y.BrlAPI.Exception</B>
+</PRE>
+<DL>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable</DD>
+</DL>
+<HR>
+<DL>
+<DT><PRE>public class <B>Exception</B><DT>extends java.lang.Exception</DL>
+</PRE>
+
+<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../serialized-form.html#org.a11y.BrlAPI.Exception">Serialized Form</A></DL>
+<HR>
+
+<P>
+
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Exception.html#Exception(long, int, int, byte[])">Exception</A></B>(long&nbsp;handle,
+          int&nbsp;errno,
+          int&nbsp;packettype,
+          byte[]&nbsp;buf)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Exception.html#toString()">toString</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Throwable"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Throwable</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="Exception(long, int, int, byte[])"><!-- --></A><H3>
+Exception</H3>
+<PRE>
+public <B>Exception</B>(long&nbsp;handle,
+                 int&nbsp;errno,
+                 int&nbsp;packettype,
+                 byte[]&nbsp;buf)</PRE>
+<DL>
+</DL>
+
+<!-- ============ METHOD DETAIL ========== -->
+
+<A NAME="method_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Method Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="toString()"><!-- --></A><H3>
+toString</H3>
+<PRE>
+public final java.lang.String <B>toString</B>()</PRE>
+<DL>
+<DD><DL>
+<DT><B>Overrides:</B><DD><CODE>toString</CODE> in class <CODE>java.lang.Throwable</CODE></DL>
+</DD>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Exception.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Key.html" title="class in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/Exception.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Exception.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Key.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Key.html
@@ -0,0 +1,453 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:11 CET 2010 -->
+<TITLE>
+Key
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Key";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Key.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Exception.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/Key.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Key.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+org.a11y.BrlAPI</FONT>
+<BR>
+Class Key</H2>
+<PRE>
+java.lang.Object
+  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>org.a11y.BrlAPI.Key</B>
+</PRE>
+<HR>
+<DL>
+<DT><PRE>public class <B>Key</B><DT>extends java.lang.Object</DL>
+</PRE>
+
+<P>
+<HR>
+
+<P>
+<!-- =========== FIELD SUMMARY =========== -->
+
+<A NAME="field_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Field Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Key.html#argument">argument</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Key.html#code">code</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Key.html#command">command</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Key.html#flags">flags</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Key.html#type">type</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Key.html#Key(long)">Key</A></B>(long&nbsp;code)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Key.html#expandKeyCode(long)">expandKeyCode</A></B>(long&nbsp;code)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Key.html#getArgument()">getArgument</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Key.html#getCode()">getCode</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Key.html#getCommand()">getCommand</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Key.html#getFlags()">getFlags</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Key.html#getType()">getType</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="code"><!-- --></A><H3>
+code</H3>
+<PRE>
+protected final long <B>code</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="type"><!-- --></A><H3>
+type</H3>
+<PRE>
+protected int <B>type</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="command"><!-- --></A><H3>
+command</H3>
+<PRE>
+protected int <B>command</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="argument"><!-- --></A><H3>
+argument</H3>
+<PRE>
+protected int <B>argument</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="flags"><!-- --></A><H3>
+flags</H3>
+<PRE>
+protected int <B>flags</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="Key(long)"><!-- --></A><H3>
+Key</H3>
+<PRE>
+public <B>Key</B>(long&nbsp;code)</PRE>
+<DL>
+</DL>
+
+<!-- ============ METHOD DETAIL ========== -->
+
+<A NAME="method_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Method Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="expandKeyCode(long)"><!-- --></A><H3>
+expandKeyCode</H3>
+<PRE>
+public final void <B>expandKeyCode</B>(long&nbsp;code)</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getCode()"><!-- --></A><H3>
+getCode</H3>
+<PRE>
+public long <B>getCode</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getType()"><!-- --></A><H3>
+getType</H3>
+<PRE>
+public int <B>getType</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getCommand()"><!-- --></A><H3>
+getCommand</H3>
+<PRE>
+public int <B>getCommand</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getArgument()"><!-- --></A><H3>
+getArgument</H3>
+<PRE>
+public int <B>getArgument</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getFlags()"><!-- --></A><H3>
+getFlags</H3>
+<PRE>
+public int <B>getFlags</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Key.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Exception.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/Key.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Key.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Native.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Native.html
@@ -0,0 +1,782 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:11 CET 2010 -->
+<TITLE>
+Native
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Native";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Native.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Key.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Test.html" title="class in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/Native.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Native.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+org.a11y.BrlAPI</FONT>
+<BR>
+Class Native</H2>
+<PRE>
+java.lang.Object
+  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>org.a11y.BrlAPI.Native</B>
+</PRE>
+<DL>
+<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../org/a11y/BrlAPI/Brlapi.html" title="class in org.a11y.BrlAPI">Brlapi</A></DD>
+</DL>
+<HR>
+<DL>
+<DT><PRE>public class <B>Native</B><DT>extends java.lang.Object</DL>
+</PRE>
+
+<P>
+<HR>
+
+<P>
+<!-- =========== FIELD SUMMARY =========== -->
+
+<A NAME="field_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Field Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#handle">handle</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#Native()">Native</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#acceptAllKeys()">acceptAllKeys</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#acceptKeyRanges(long[][])">acceptKeyRanges</A></B>(long[][]&nbsp;ranges)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#acceptKeys(long, long[])">acceptKeys</A></B>(long&nbsp;type,
+           long[]&nbsp;keys)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#closeConnection()">closeConnection</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#enterRawMode(java.lang.String)">enterRawMode</A></B>(java.lang.String&nbsp;driver)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#enterTtyMode(int, java.lang.String)">enterTtyMode</A></B>(int&nbsp;tty,
+             java.lang.String&nbsp;driver)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#enterTtyModeWithPath(int[], java.lang.String)">enterTtyModeWithPath</A></B>(int[]&nbsp;ttys,
+                     java.lang.String&nbsp;driver)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI">DisplaySize</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#getDisplaySize()">getDisplaySize</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#getDriverName()">getDriverName</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#getPacketTypeName(long)">getPacketTypeName</A></B>(long&nbsp;type)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#ignoreAllKeys()">ignoreAllKeys</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#ignoreKeyRanges(long[][])">ignoreKeyRanges</A></B>(long[][]&nbsp;ranges)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#ignoreKeys(long, long[])">ignoreKeys</A></B>(long&nbsp;type,
+           long[]&nbsp;keys)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#leaveRawMode()">leaveRawMode</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#leaveTtyMode()">leaveTtyMode</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#openConnection(org.a11y.BrlAPI.ConnectionSettings, org.a11y.BrlAPI.ConnectionSettings)">openConnection</A></B>(<A HREF="../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A>&nbsp;desiredSettings,
+               <A HREF="../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A>&nbsp;actualSettings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#readKey(boolean)">readKey</A></B>(boolean&nbsp;wait)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#recvRaw(byte[])">recvRaw</A></B>(byte[]&nbsp;buffer)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#sendRaw(byte[])">sendRaw</A></B>(byte[]&nbsp;buffer)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#setFocus(int)">setFocus</A></B>(int&nbsp;tty)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#write(org.a11y.BrlAPI.WriteArguments)">write</A></B>(<A HREF="../../../org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI">WriteArguments</A>&nbsp;arguments)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#writeDots(byte[])">writeDots</A></B>(byte[]&nbsp;dots)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Native.html#writeTextNative(int, java.lang.String)">writeTextNative</A></B>(int&nbsp;cursor,
+                java.lang.String&nbsp;text)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="handle"><!-- --></A><H3>
+handle</H3>
+<PRE>
+protected long <B>handle</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="Native()"><!-- --></A><H3>
+Native</H3>
+<PRE>
+public <B>Native</B>()</PRE>
+<DL>
+</DL>
+
+<!-- ============ METHOD DETAIL ========== -->
+
+<A NAME="method_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Method Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="openConnection(org.a11y.BrlAPI.ConnectionSettings, org.a11y.BrlAPI.ConnectionSettings)"><!-- --></A><H3>
+openConnection</H3>
+<PRE>
+protected int <B>openConnection</B>(<A HREF="../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A>&nbsp;desiredSettings,
+                             <A HREF="../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A>&nbsp;actualSettings)
+                      throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="closeConnection()"><!-- --></A><H3>
+closeConnection</H3>
+<PRE>
+public void <B>closeConnection</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getDriverName()"><!-- --></A><H3>
+getDriverName</H3>
+<PRE>
+public java.lang.String <B>getDriverName</B>()
+                               throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getDisplaySize()"><!-- --></A><H3>
+getDisplaySize</H3>
+<PRE>
+public <A HREF="../../../org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI">DisplaySize</A> <B>getDisplaySize</B>()
+                           throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="enterTtyMode(int, java.lang.String)"><!-- --></A><H3>
+enterTtyMode</H3>
+<PRE>
+public int <B>enterTtyMode</B>(int&nbsp;tty,
+                        java.lang.String&nbsp;driver)
+                 throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="enterTtyModeWithPath(int[], java.lang.String)"><!-- --></A><H3>
+enterTtyModeWithPath</H3>
+<PRE>
+public void <B>enterTtyModeWithPath</B>(int[]&nbsp;ttys,
+                                 java.lang.String&nbsp;driver)
+                          throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="leaveTtyMode()"><!-- --></A><H3>
+leaveTtyMode</H3>
+<PRE>
+public void <B>leaveTtyMode</B>()
+                  throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="setFocus(int)"><!-- --></A><H3>
+setFocus</H3>
+<PRE>
+public void <B>setFocus</B>(int&nbsp;tty)
+              throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="writeTextNative(int, java.lang.String)"><!-- --></A><H3>
+writeTextNative</H3>
+<PRE>
+protected void <B>writeTextNative</B>(int&nbsp;cursor,
+                               java.lang.String&nbsp;text)
+                        throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="writeDots(byte[])"><!-- --></A><H3>
+writeDots</H3>
+<PRE>
+public void <B>writeDots</B>(byte[]&nbsp;dots)
+               throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="write(org.a11y.BrlAPI.WriteArguments)"><!-- --></A><H3>
+write</H3>
+<PRE>
+public void <B>write</B>(<A HREF="../../../org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI">WriteArguments</A>&nbsp;arguments)
+           throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="readKey(boolean)"><!-- --></A><H3>
+readKey</H3>
+<PRE>
+public long <B>readKey</B>(boolean&nbsp;wait)
+             throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="ignoreKeys(long, long[])"><!-- --></A><H3>
+ignoreKeys</H3>
+<PRE>
+public void <B>ignoreKeys</B>(long&nbsp;type,
+                       long[]&nbsp;keys)
+                throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="acceptKeys(long, long[])"><!-- --></A><H3>
+acceptKeys</H3>
+<PRE>
+public void <B>acceptKeys</B>(long&nbsp;type,
+                       long[]&nbsp;keys)
+                throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="ignoreAllKeys()"><!-- --></A><H3>
+ignoreAllKeys</H3>
+<PRE>
+public void <B>ignoreAllKeys</B>()
+                   throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="acceptAllKeys()"><!-- --></A><H3>
+acceptAllKeys</H3>
+<PRE>
+public void <B>acceptAllKeys</B>()
+                   throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="ignoreKeyRanges(long[][])"><!-- --></A><H3>
+ignoreKeyRanges</H3>
+<PRE>
+public void <B>ignoreKeyRanges</B>(long[][]&nbsp;ranges)
+                     throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="acceptKeyRanges(long[][])"><!-- --></A><H3>
+acceptKeyRanges</H3>
+<PRE>
+public void <B>acceptKeyRanges</B>(long[][]&nbsp;ranges)
+                     throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="enterRawMode(java.lang.String)"><!-- --></A><H3>
+enterRawMode</H3>
+<PRE>
+public void <B>enterRawMode</B>(java.lang.String&nbsp;driver)
+                  throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="leaveRawMode()"><!-- --></A><H3>
+leaveRawMode</H3>
+<PRE>
+public void <B>leaveRawMode</B>()
+                  throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="sendRaw(byte[])"><!-- --></A><H3>
+sendRaw</H3>
+<PRE>
+public int <B>sendRaw</B>(byte[]&nbsp;buffer)
+            throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="recvRaw(byte[])"><!-- --></A><H3>
+recvRaw</H3>
+<PRE>
+public int <B>recvRaw</B>(byte[]&nbsp;buffer)
+            throws <A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getPacketTypeName(long)"><!-- --></A><H3>
+getPacketTypeName</H3>
+<PRE>
+public static java.lang.String <B>getPacketTypeName</B>(long&nbsp;type)</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Native.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Key.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Test.html" title="class in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/Native.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Native.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Test.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/Test.html
@@ -0,0 +1,250 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:11 CET 2010 -->
+<TITLE>
+Test
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Test";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Test.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/Test.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Test.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+org.a11y.BrlAPI</FONT>
+<BR>
+Class Test</H2>
+<PRE>
+java.lang.Object
+  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>org.a11y.BrlAPI.Test</B>
+</PRE>
+<HR>
+<DL>
+<DT><PRE>public class <B>Test</B><DT>extends java.lang.Object</DL>
+</PRE>
+
+<P>
+<HR>
+
+<P>
+
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Test.html#Test()">Test</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/Test.html#main(java.lang.String[])">main</A></B>(java.lang.String[]&nbsp;argv)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="Test()"><!-- --></A><H3>
+Test</H3>
+<PRE>
+public <B>Test</B>()</PRE>
+<DL>
+</DL>
+
+<!-- ============ METHOD DETAIL ========== -->
+
+<A NAME="method_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Method Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="main(java.lang.String[])"><!-- --></A><H3>
+main</H3>
+<PRE>
+public static void <B>main</B>(java.lang.String[]&nbsp;argv)</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/Test.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/Test.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Test.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/WriteArguments.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/WriteArguments.html
@@ -0,0 +1,366 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:11 CET 2010 -->
+<TITLE>
+WriteArguments
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="WriteArguments";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/WriteArguments.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Test.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;NEXT CLASS</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/WriteArguments.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="WriteArguments.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+org.a11y.BrlAPI</FONT>
+<BR>
+Class WriteArguments</H2>
+<PRE>
+java.lang.Object
+  <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>org.a11y.BrlAPI.WriteArguments</B>
+</PRE>
+<HR>
+<DL>
+<DT><PRE>public class <B>WriteArguments</B><DT>extends java.lang.Object</DL>
+</PRE>
+
+<P>
+<HR>
+
+<P>
+<!-- =========== FIELD SUMMARY =========== -->
+
+<A NAME="field_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Field Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;byte[]</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/WriteArguments.html#andMask">andMask</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/WriteArguments.html#cursor">cursor</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/WriteArguments.html#displayNumber">displayNumber</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;byte[]</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/WriteArguments.html#orMask">orMask</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/WriteArguments.html#regionBegin">regionBegin</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/WriteArguments.html#regionSize">regionSize</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/WriteArguments.html#text">text</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/a11y/BrlAPI/WriteArguments.html#WriteArguments()">WriteArguments</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="displayNumber"><!-- --></A><H3>
+displayNumber</H3>
+<PRE>
+public int <B>displayNumber</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="regionBegin"><!-- --></A><H3>
+regionBegin</H3>
+<PRE>
+public int <B>regionBegin</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="regionSize"><!-- --></A><H3>
+regionSize</H3>
+<PRE>
+public int <B>regionSize</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="text"><!-- --></A><H3>
+text</H3>
+<PRE>
+public java.lang.String <B>text</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="andMask"><!-- --></A><H3>
+andMask</H3>
+<PRE>
+public byte[] <B>andMask</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="orMask"><!-- --></A><H3>
+orMask</H3>
+<PRE>
+public byte[] <B>orMask</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="cursor"><!-- --></A><H3>
+cursor</H3>
+<PRE>
+public int <B>cursor</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="WriteArguments()"><!-- --></A><H3>
+WriteArguments</H3>
+<PRE>
+public <B>WriteArguments</B>()</PRE>
+<DL>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/WriteArguments.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/a11y/BrlAPI/Test.html" title="class in org.a11y.BrlAPI"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;NEXT CLASS</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/WriteArguments.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="WriteArguments.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Brlapi.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Brlapi.html
@@ -0,0 +1,142 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Uses of Class org.a11y.BrlAPI.Brlapi
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Class org.a11y.BrlAPI.Brlapi";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Brlapi.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useBrlapi.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Brlapi.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Class<br>org.a11y.BrlAPI.Brlapi</B></H2>
+</CENTER>
+No usage of org.a11y.BrlAPI.Brlapi
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Brlapi.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useBrlapi.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Brlapi.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/ConnectionSettings.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/ConnectionSettings.html
@@ -0,0 +1,196 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Uses of Class org.a11y.BrlAPI.ConnectionSettings
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Class org.a11y.BrlAPI.ConnectionSettings";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useConnectionSettings.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="ConnectionSettings.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Class<br>org.a11y.BrlAPI.ConnectionSettings</B></H2>
+</CENTER>
+<A NAME="org.a11y.BrlAPI"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A> in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A> declared as <A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;<A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A></CODE></FONT></TD>
+<TD><CODE><B>Brlapi.</B><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html#settings">settings</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A> with parameters of type <A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#openConnection(org.a11y.BrlAPI.ConnectionSettings, org.a11y.BrlAPI.ConnectionSettings)">openConnection</A></B>(<A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A>&nbsp;desiredSettings,
+               <A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A>&nbsp;actualSettings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A> with parameters of type <A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html#Brlapi(org.a11y.BrlAPI.ConnectionSettings)">Brlapi</A></B>(<A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A>&nbsp;settings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useConnectionSettings.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="ConnectionSettings.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Constants.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Constants.html
@@ -0,0 +1,165 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Uses of Interface org.a11y.BrlAPI.Constants
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Interface org.a11y.BrlAPI.Constants";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useConstants.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Constants.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Interface<br>org.a11y.BrlAPI.Constants</B></H2>
+</CENTER>
+<A NAME="org.a11y.BrlAPI"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../../org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI">Constants</A> in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Classes in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A> that implement <A HREF="../../../../org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI">Constants</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;class</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html" title="class in org.a11y.BrlAPI">Brlapi</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useConstants.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Constants.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/DisplaySize.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/DisplaySize.html
@@ -0,0 +1,165 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Uses of Class org.a11y.BrlAPI.DisplaySize
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Class org.a11y.BrlAPI.DisplaySize";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useDisplaySize.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="DisplaySize.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Class<br>org.a11y.BrlAPI.DisplaySize</B></H2>
+</CENTER>
+<A NAME="org.a11y.BrlAPI"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../../org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI">DisplaySize</A> in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A> that return <A HREF="../../../../org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI">DisplaySize</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI">DisplaySize</A></CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#getDisplaySize()">getDisplaySize</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useDisplaySize.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="DisplaySize.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Error.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Error.html
@@ -0,0 +1,411 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Uses of Class org.a11y.BrlAPI.Error
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Class org.a11y.BrlAPI.Error";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useError.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Error.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Class<br>org.a11y.BrlAPI.Error</B></H2>
+</CENTER>
+<A NAME="org.a11y.BrlAPI"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A> in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A> that throw <A HREF="../../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#acceptAllKeys()">acceptAllKeys</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#acceptKeyRanges(long[][])">acceptKeyRanges</A></B>(long[][]&nbsp;ranges)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#acceptKeys(long, long[])">acceptKeys</A></B>(long&nbsp;type,
+           long[]&nbsp;keys)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#enterRawMode(java.lang.String)">enterRawMode</A></B>(java.lang.String&nbsp;driver)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>Brlapi.</B><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html#enterTtyMode()">enterTtyMode</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>Brlapi.</B><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html#enterTtyMode(int)">enterTtyMode</A></B>(int&nbsp;tty)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#enterTtyMode(int, java.lang.String)">enterTtyMode</A></B>(int&nbsp;tty,
+             java.lang.String&nbsp;driver)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>Brlapi.</B><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html#enterTtyMode(java.lang.String)">enterTtyMode</A></B>(java.lang.String&nbsp;driver)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Brlapi.</B><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html#enterTtyModeWithPath(int[])">enterTtyModeWithPath</A></B>(int[]&nbsp;ttys)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#enterTtyModeWithPath(int[], java.lang.String)">enterTtyModeWithPath</A></B>(int[]&nbsp;ttys,
+                     java.lang.String&nbsp;driver)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI">DisplaySize</A></CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#getDisplaySize()">getDisplaySize</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#getDriverName()">getDriverName</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#ignoreAllKeys()">ignoreAllKeys</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#ignoreKeyRanges(long[][])">ignoreKeyRanges</A></B>(long[][]&nbsp;ranges)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#ignoreKeys(long, long[])">ignoreKeys</A></B>(long&nbsp;type,
+           long[]&nbsp;keys)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#leaveRawMode()">leaveRawMode</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#leaveTtyMode()">leaveTtyMode</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#openConnection(org.a11y.BrlAPI.ConnectionSettings, org.a11y.BrlAPI.ConnectionSettings)">openConnection</A></B>(<A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A>&nbsp;desiredSettings,
+               <A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A>&nbsp;actualSettings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;long</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#readKey(boolean)">readKey</A></B>(boolean&nbsp;wait)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#recvRaw(byte[])">recvRaw</A></B>(byte[]&nbsp;buffer)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#sendRaw(byte[])">sendRaw</A></B>(byte[]&nbsp;buffer)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#setFocus(int)">setFocus</A></B>(int&nbsp;tty)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#write(org.a11y.BrlAPI.WriteArguments)">write</A></B>(<A HREF="../../../../org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI">WriteArguments</A>&nbsp;arguments)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#writeDots(byte[])">writeDots</A></B>(byte[]&nbsp;dots)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Brlapi.</B><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html#writeText(int)">writeText</A></B>(int&nbsp;cursor)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Brlapi.</B><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html#writeText(int, java.lang.String)">writeText</A></B>(int&nbsp;cursor,
+          java.lang.String&nbsp;text)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Brlapi.</B><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html#writeText(java.lang.String)">writeText</A></B>(java.lang.String&nbsp;text)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Brlapi.</B><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html#writeText(java.lang.String, int)">writeText</A></B>(java.lang.String&nbsp;text,
+          int&nbsp;cursor)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#writeTextNative(int, java.lang.String)">writeTextNative</A></B>(int&nbsp;cursor,
+                java.lang.String&nbsp;text)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A> that throw <A HREF="../../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html#Brlapi(org.a11y.BrlAPI.ConnectionSettings)">Brlapi</A></B>(<A HREF="../../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A>&nbsp;settings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useError.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Error.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Exception.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Exception.html
@@ -0,0 +1,142 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Uses of Class org.a11y.BrlAPI.Exception
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Class org.a11y.BrlAPI.Exception";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Exception.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useException.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Exception.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Class<br>org.a11y.BrlAPI.Exception</B></H2>
+</CENTER>
+No usage of org.a11y.BrlAPI.Exception
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Exception.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useException.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Exception.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Key.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Key.html
@@ -0,0 +1,142 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Uses of Class org.a11y.BrlAPI.Key
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Class org.a11y.BrlAPI.Key";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Key.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useKey.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Key.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Class<br>org.a11y.BrlAPI.Key</B></H2>
+</CENTER>
+No usage of org.a11y.BrlAPI.Key
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Key.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useKey.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Key.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Native.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Native.html
@@ -0,0 +1,165 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Uses of Class org.a11y.BrlAPI.Native
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Class org.a11y.BrlAPI.Native";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useNative.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Native.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Class<br>org.a11y.BrlAPI.Native</B></H2>
+</CENTER>
+<A NAME="org.a11y.BrlAPI"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../../org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI">Native</A> in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Subclasses of <A HREF="../../../../org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI">Native</A> in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;class</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../org/a11y/BrlAPI/Brlapi.html" title="class in org.a11y.BrlAPI">Brlapi</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useNative.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Native.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Test.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/Test.html
@@ -0,0 +1,142 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Uses of Class org.a11y.BrlAPI.Test
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Class org.a11y.BrlAPI.Test";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Test.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useTest.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Test.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Class<br>org.a11y.BrlAPI.Test</B></H2>
+</CENTER>
+No usage of org.a11y.BrlAPI.Test
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/Test.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useTest.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Test.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/WriteArguments.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/class-use/WriteArguments.html
@@ -0,0 +1,165 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Uses of Class org.a11y.BrlAPI.WriteArguments
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Class org.a11y.BrlAPI.WriteArguments";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useWriteArguments.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="WriteArguments.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Class<br>org.a11y.BrlAPI.WriteArguments</B></H2>
+</CENTER>
+<A NAME="org.a11y.BrlAPI"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../../org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI">WriteArguments</A> in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A> with parameters of type <A HREF="../../../../org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI">WriteArguments</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Native.</B><B><A HREF="../../../../org/a11y/BrlAPI/Native.html#write(org.a11y.BrlAPI.WriteArguments)">write</A></B>(<A HREF="../../../../org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI">WriteArguments</A>&nbsp;arguments)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/a11y/BrlAPI//class-useWriteArguments.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="WriteArguments.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/package-frame.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/package-frame.html
@@ -0,0 +1,77 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:11 CET 2010 -->
+<TITLE>
+org.a11y.BrlAPI
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+
+</HEAD>
+
+<BODY BGCOLOR="white">
+<FONT size="+1" CLASS="FrameTitleFont">
+<A HREF="../../../org/a11y/BrlAPI/package-summary.html" target="classFrame">org.a11y.BrlAPI</A></FONT>
+<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+<TR>
+<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
+Interfaces</FONT>&nbsp;
+<FONT CLASS="FrameItemFont">
+<BR>
+<A HREF="Constants.html" title="interface in org.a11y.BrlAPI" target="classFrame"><I>Constants</I></A></FONT></TD>
+</TR>
+</TABLE>
+
+
+<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+<TR>
+<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
+Classes</FONT>&nbsp;
+<FONT CLASS="FrameItemFont">
+<BR>
+<A HREF="Brlapi.html" title="class in org.a11y.BrlAPI" target="classFrame">Brlapi</A>
+<BR>
+<A HREF="ConnectionSettings.html" title="class in org.a11y.BrlAPI" target="classFrame">ConnectionSettings</A>
+<BR>
+<A HREF="DisplaySize.html" title="class in org.a11y.BrlAPI" target="classFrame">DisplaySize</A>
+<BR>
+<A HREF="Key.html" title="class in org.a11y.BrlAPI" target="classFrame">Key</A>
+<BR>
+<A HREF="Native.html" title="class in org.a11y.BrlAPI" target="classFrame">Native</A>
+<BR>
+<A HREF="Test.html" title="class in org.a11y.BrlAPI" target="classFrame">Test</A>
+<BR>
+<A HREF="WriteArguments.html" title="class in org.a11y.BrlAPI" target="classFrame">WriteArguments</A></FONT></TD>
+</TR>
+</TABLE>
+
+
+<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+<TR>
+<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
+Exceptions</FONT>&nbsp;
+<FONT CLASS="FrameItemFont">
+<BR>
+<A HREF="Exception.html" title="class in org.a11y.BrlAPI" target="classFrame">Exception</A></FONT></TD>
+</TR>
+</TABLE>
+
+
+<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+<TR>
+<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
+Errors</FONT>&nbsp;
+<FONT CLASS="FrameItemFont">
+<BR>
+<A HREF="Error.html" title="class in org.a11y.BrlAPI" target="classFrame">Error</A></FONT></TD>
+</TR>
+</TABLE>
+
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/package-summary.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/package-summary.html
@@ -0,0 +1,221 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:11 CET 2010 -->
+<TITLE>
+org.a11y.BrlAPI
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="org.a11y.BrlAPI";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV PACKAGE&nbsp;
+&nbsp;NEXT PACKAGE</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<H2>
+Package org.a11y.BrlAPI
+</H2>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Interface Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI">Constants</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Class Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../org/a11y/BrlAPI/Brlapi.html" title="class in org.a11y.BrlAPI">Brlapi</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI">ConnectionSettings</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI">DisplaySize</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../org/a11y/BrlAPI/Key.html" title="class in org.a11y.BrlAPI">Key</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI">Native</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../org/a11y/BrlAPI/Test.html" title="class in org.a11y.BrlAPI">Test</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI">WriteArguments</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Exception Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../org/a11y/BrlAPI/Exception.html" title="class in org.a11y.BrlAPI">Exception</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Error Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">Error</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+
+<P>
+<DL>
+</DL>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV PACKAGE&nbsp;
+&nbsp;NEXT PACKAGE</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/package-tree.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/package-tree.html
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:11 CET 2010 -->
+<TITLE>
+org.a11y.BrlAPI Class Hierarchy
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="org.a11y.BrlAPI Class Hierarchy";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+Hierarchy For Package org.a11y.BrlAPI
+</H2>
+</CENTER>
+<H2>
+Class Hierarchy
+</H2>
+<UL>
+<LI TYPE="circle">java.lang.Object<UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="../../../org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI"><B>ConnectionSettings</B></A><LI TYPE="circle">org.a11y.BrlAPI.<A HREF="../../../org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI"><B>DisplaySize</B></A><LI TYPE="circle">org.a11y.BrlAPI.<A HREF="../../../org/a11y/BrlAPI/Key.html" title="class in org.a11y.BrlAPI"><B>Key</B></A><LI TYPE="circle">org.a11y.BrlAPI.<A HREF="../../../org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI"><B>Native</B></A><UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="../../../org/a11y/BrlAPI/Brlapi.html" title="class in org.a11y.BrlAPI"><B>Brlapi</B></A> (implements org.a11y.BrlAPI.<A HREF="../../../org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI">Constants</A>)
+</UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="../../../org/a11y/BrlAPI/Test.html" title="class in org.a11y.BrlAPI"><B>Test</B></A><LI TYPE="circle">java.lang.Throwable (implements java.io.Serializable)
+<UL>
+<LI TYPE="circle">java.lang.Error<UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="../../../org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI"><B>Error</B></A></UL>
+<LI TYPE="circle">java.lang.Exception<UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="../../../org/a11y/BrlAPI/Exception.html" title="class in org.a11y.BrlAPI"><B>Exception</B></A></UL>
+</UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="../../../org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI"><B>WriteArguments</B></A></UL>
+</UL>
+<H2>
+Interface Hierarchy
+</H2>
+<UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="../../../org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI"><B>Constants</B></A></UL>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/package-use.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/org/a11y/BrlAPI/package-use.html
@@ -0,0 +1,185 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Uses of Package org.a11y.BrlAPI
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Package org.a11y.BrlAPI";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/package-use.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Package<br>org.a11y.BrlAPI</B></H2>
+</CENTER>
+<A NAME="org.a11y.BrlAPI"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Classes in <A HREF="../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A> used by <A HREF="../../../org/a11y/BrlAPI/package-summary.html">org.a11y.BrlAPI</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../org/a11y/BrlAPI/class-use/ConnectionSettings.html#org.a11y.BrlAPI"><B>ConnectionSettings</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../org/a11y/BrlAPI/class-use/Constants.html#org.a11y.BrlAPI"><B>Constants</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../org/a11y/BrlAPI/class-use/DisplaySize.html#org.a11y.BrlAPI"><B>DisplaySize</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../org/a11y/BrlAPI/class-use/Error.html#org.a11y.BrlAPI"><B>Error</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../org/a11y/BrlAPI/class-use/Native.html#org.a11y.BrlAPI"><B>Native</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../org/a11y/BrlAPI/class-use/WriteArguments.html#org.a11y.BrlAPI"><B>WriteArguments</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/a11y/BrlAPI/package-use.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/overview-tree.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/overview-tree.html
@@ -0,0 +1,165 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Class Hierarchy
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Class Hierarchy";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="index.html?overview-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="overview-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+Hierarchy For All Packages</H2>
+</CENTER>
+<DL>
+<DT><B>Package Hierarchies:</B><DD><A HREF="org/a11y/BrlAPI/package-tree.html">org.a11y.BrlAPI</A></DL>
+<HR>
+<H2>
+Class Hierarchy
+</H2>
+<UL>
+<LI TYPE="circle">java.lang.Object<UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="org/a11y/BrlAPI/ConnectionSettings.html" title="class in org.a11y.BrlAPI"><B>ConnectionSettings</B></A><LI TYPE="circle">org.a11y.BrlAPI.<A HREF="org/a11y/BrlAPI/DisplaySize.html" title="class in org.a11y.BrlAPI"><B>DisplaySize</B></A><LI TYPE="circle">org.a11y.BrlAPI.<A HREF="org/a11y/BrlAPI/Key.html" title="class in org.a11y.BrlAPI"><B>Key</B></A><LI TYPE="circle">org.a11y.BrlAPI.<A HREF="org/a11y/BrlAPI/Native.html" title="class in org.a11y.BrlAPI"><B>Native</B></A><UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="org/a11y/BrlAPI/Brlapi.html" title="class in org.a11y.BrlAPI"><B>Brlapi</B></A> (implements org.a11y.BrlAPI.<A HREF="org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI">Constants</A>)
+</UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="org/a11y/BrlAPI/Test.html" title="class in org.a11y.BrlAPI"><B>Test</B></A><LI TYPE="circle">java.lang.Throwable (implements java.io.Serializable)
+<UL>
+<LI TYPE="circle">java.lang.Error<UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI"><B>Error</B></A></UL>
+<LI TYPE="circle">java.lang.Exception<UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="org/a11y/BrlAPI/Exception.html" title="class in org.a11y.BrlAPI"><B>Exception</B></A></UL>
+</UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="org/a11y/BrlAPI/WriteArguments.html" title="class in org.a11y.BrlAPI"><B>WriteArguments</B></A></UL>
+</UL>
+<H2>
+Interface Hierarchy
+</H2>
+<UL>
+<LI TYPE="circle">org.a11y.BrlAPI.<A HREF="org/a11y/BrlAPI/Constants.html" title="interface in org.a11y.BrlAPI"><B>Constants</B></A></UL>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="index.html?overview-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="overview-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/package-list
+++ b/grub-core/braille/brltty/Bindings/Java/doc/package-list
@@ -0,0 +1 @@
+org.a11y.BrlAPI
--- a/grub-core/braille/brltty/Bindings/Java/doc/serialized-form.html
+++ b/grub-core/braille/brltty/Bindings/Java/doc/serialized-form.html
@@ -0,0 +1,264 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.6.0_18) on Fri Nov 19 06:05:12 CET 2010 -->
+<TITLE>
+Serialized Form
+</TITLE>
+
+<META NAME="date" CONTENT="2010-11-19">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Serialized Form";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="index.html?serialized-form.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="serialized-form.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H1>
+Serialized Form</H1>
+</CENTER>
+<HR SIZE="4" NOSHADE>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="center"><FONT SIZE="+2">
+<B>Package</B> <B>org.a11y.BrlAPI</B></FONT></TH>
+</TR>
+</TABLE>
+
+<P>
+<A NAME="org.a11y.BrlAPI.Error"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Class <A HREF="org/a11y/BrlAPI/Error.html" title="class in org.a11y.BrlAPI">org.a11y.BrlAPI.Error</A> extends java.lang.Error implements Serializable</B></FONT></TH>
+</TR>
+</TABLE>
+
+<P>
+<B>serialVersionUID:&nbsp;</B>0L
+
+<P>
+<A NAME="serializedForm"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Serialized Fields</B></FONT></TH>
+</TR>
+</TABLE>
+
+<H3>
+brlerrno</H3>
+<PRE>
+int <B>brlerrno</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+<H3>
+libcerrno</H3>
+<PRE>
+int <B>libcerrno</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+<H3>
+gaierrno</H3>
+<PRE>
+int <B>gaierrno</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+<H3>
+errfun</H3>
+<PRE>
+java.lang.String <B>errfun</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
+<P>
+<A NAME="org.a11y.BrlAPI.Exception"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Class <A HREF="org/a11y/BrlAPI/Exception.html" title="class in org.a11y.BrlAPI">org.a11y.BrlAPI.Exception</A> extends java.lang.Exception implements Serializable</B></FONT></TH>
+</TR>
+</TABLE>
+
+<P>
+<B>serialVersionUID:&nbsp;</B>0L
+
+<P>
+<A NAME="serializedForm"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Serialized Fields</B></FONT></TH>
+</TR>
+</TABLE>
+
+<H3>
+handle</H3>
+<PRE>
+long <B>handle</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+<H3>
+errno</H3>
+<PRE>
+int <B>errno</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+<H3>
+packettype</H3>
+<PRE>
+long <B>packettype</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+<H3>
+buf</H3>
+<PRE>
+byte[] <B>buf</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/a11y/BrlAPI/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="index.html?serialized-form.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="serialized-form.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/grub-core/braille/brltty/Bindings/Java/doc/stylesheet.css
+++ b/grub-core/braille/brltty/Bindings/Java/doc/stylesheet.css
@@ -0,0 +1,29 @@
+/* Javadoc style sheet */
+
+/* Define colors, fonts and other style attributes here to override the defaults */
+
+/* Page background color */
+body { background-color: #FFFFFF; color:#000000 }
+
+/* Headings */
+h1 { font-size: 145% }
+
+/* Table colors */
+.TableHeadingColor     { background: #CCCCFF; color:#000000 } /* Dark mauve */
+.TableSubHeadingColor  { background: #EEEEFF; color:#000000 } /* Light mauve */
+.TableRowColor         { background: #FFFFFF; color:#000000 } /* White */
+
+/* Font used in left-hand frame lists */
+.FrameTitleFont   { font-size: 100%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
+.FrameHeadingFont { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
+.FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
+
+/* Navigation bar fonts and colors */
+.NavBarCell1    { background-color:#EEEEFF; color:#000000} /* Light mauve */
+.NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */
+.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;}
+.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;}
+
+.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000}
+.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000}
+
--- a/grub-core/braille/brltty/Bindings/Java/reldeps.mk
+++ b/grub-core/braille/brltty/Bindings/Java/reldeps.mk
@@ -0,0 +1,6 @@
+# Dependencies for bindings.$O:
+bindings.$O: $(SRC_DIR)/bindings.c
+bindings.$O: $(BLD_TOP)Programs/brlapi.h
+bindings.$O: $(BLD_TOP)Programs/brlapi_constants.h
+bindings.$O: $(SRC_TOP)Programs/brlapi_keycodes.h
+
--- a/grub-core/braille/brltty/Bindings/Lisp/bindings.m4
+++ b/grub-core/braille/brltty/Bindings/Lisp/bindings.m4
@@ -0,0 +1,21 @@
+###############################################################################
+# libbrlapi - A library providing access to braille terminals for applications.
+#
+# Copyright (C) 2006-2012 by Dave Mielke <dave@mielke.cc>
+#
+# libbrlapi comes with ABSOLUTELY NO WARRANTY.
+#
+# This is free software, placed under the terms of the
+# GNU Lesser General Public License, as published by the Free Software
+# Foundation; either version 2.1 of the License, or (at your option) any
+# later version. Please see the file LICENSE-LGPL for details.
+#
+# Web Page: http://mielke.cc/brltty/
+#
+# This software is maintained by Dave Mielke <dave@mielke.cc>.
+###############################################################################
+
+AC_DEFUN([BRLTTY_LISP_BINDINGS], [dnl
+LISP_OK=true
+AC_SUBST([LISP_OK])
+])
--- a/grub-core/braille/brltty/Bindings/Lisp/brlapi.asd
+++ b/grub-core/braille/brltty/Bindings/Lisp/brlapi.asd
@@ -0,0 +1,27 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; libbrlapi - A library providing access to braille terminals for applications.
+;
+; Copyright (C) 2006-2012 by Mario Lang <mlang@delysid.org>
+;
+; libbrlapi comes with ABSOLUTELY NO WARRANTY.
+;
+; This is free software, placed under the terms of the
+; GNU Lesser General Public License, as published by the Free Software
+; Foundation; either version 2.1 of the License, or (at your option) any
+; later version. Please see the file LICENSE-LGPL for details.
+;
+; Web Page: http://mielke.cc/brltty/
+;
+; This software is maintained by Dave Mielke <dave@mielke.cc>.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;; * BrlAPI System Definition
+
+(asdf:defsystem :brlapi
+  :name "brlapi"
+  :author "Mario Lang <mlang@delysid.org>"
+  :depends-on (:cffi)
+  :serial t
+  :components ((:file "brlapi")))
+
+;;;;@include "brlapi.lisp"
--- a/grub-core/braille/brltty/Bindings/Lisp/brlapi.lisp
+++ b/grub-core/braille/brltty/Bindings/Lisp/brlapi.lisp
@@ -0,0 +1,246 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; libbrlapi - A library providing access to braille terminals for applications.
+;
+; Copyright (C) 2006-2012 by Mario Lang <mlang@delysid.org>
+;
+; libbrlapi comes with ABSOLUTELY NO WARRANTY.
+;
+; This is free software, placed under the terms of the
+; GNU Lesser General Public License, as published by the Free Software
+; Foundation; either version 2.1 of the License, or (at your option) any
+; later version. Please see the file LICENSE-LGPL for details.
+;
+; Web Page: http://mielke.cc/brltty/
+;
+; This software is maintained by Dave Mielke <dave@mielke.cc>.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(eval-when (:compile-toplevel)
+  (declaim (optimize (safety 3) (debug 3))))
+
+;;;; * Package definition
+
+(defpackage :brlapi
+  (:use :common-lisp :cffi)
+  (:export #:open-connection #:close-connection
+	   #:driver-name #:display-size
+           #:enter-tty-mode #:leave-tty-mode
+           #:write-text #:write-dots #:write-region
+           #:read-key #:expand-key))
+(in-package :brlapi)
+
+
+;;;; * C BrlAPI Library loading
+
+(define-foreign-library libbrlapi
+  (:unix (:or "libbrlapi.so.0.5.5" "libbrlapi.so.0.5"))
+  (t (:default "libbrlapi")))
+(use-foreign-library libbrlapi)
+
+;;;; * The DISPLAY class
+
+(defclass display ()
+  ((handle :initarg :handle :reader display-handle)
+   (fd :initarg :fd :reader display-file-descriptor)
+   (auth :initarg :auth :reader display-auth)
+   (host :initarg :host :reader display-host)
+   (tty :initform nil :reader display-tty)))
+
+(defmethod print-object ((obj display) stream)
+  (print-unreadable-object (obj stream :type t)
+    (if (not (display-file-descriptor obj))
+        (format stream "disconnected")
+      (apply #'format stream "~Dx~D fd=~D, host=~A, driver=~A"
+             (concatenate 'list (multiple-value-list (display-size obj))
+                          (list (display-file-descriptor obj) (display-host obj)
+                                (driver-name obj)))))))
+
+
+;;;; * Error handling
+
+(defctype brlapi-code :int)
+(define-condition brlapi-error (error)
+  ((text :initarg :text :reader brlapi-error-text))
+  (:report (lambda (c stream)
+             (format stream "libbrlapi function returned ~A"
+                     (brlapi-error-text c))))
+  (:documentation "Signalled when a libbrlapi function answers with -1."))
+
+(defmethod translate-from-foreign (value (name (eql 'brlapi-code)))
+  "Raise a BRLAPI-ERROR if VALUE, a brlapi-code, is -1."
+  (declare (integer value))
+  (if (eql value -1)
+      (error 'brlapi-error
+             :text (foreign-funcall "brlapi_strerror"
+                                    :pointer
+                                    (foreign-funcall "brlapi_error_location"
+                                                     :pointer)
+                                    :string))
+    value))
+
+
+;;;; * Connection management
+
+(defcstruct settings
+  "Connection setting structure."
+  (auth :string)
+  (host :string))
+
+(defun open-connection (&optional auth host)
+  "Open a new connection to BRLTTY on HOST usng AUTH for authorization.
+Return a DISPLAY object which can further be used to interact with BRLTTY."
+  (with-foreign-object (settings 'settings)
+    (setf (foreign-slot-value settings 'settings 'auth)
+          (if (stringp auth) auth (null-pointer))
+          (foreign-slot-value settings 'settings 'host)
+          (if (stringp host) host (null-pointer)))
+    (let* ((handle (foreign-alloc :char :count (foreign-funcall "brlapi_getHandleSize" :int)))
+           (fd (foreign-funcall "brlapi__openConnection"
+                                :pointer handle
+                                :pointer settings
+                                :pointer settings
+                                brlapi-code))
+           (display (make-instance 'display :handle handle :fd fd
+                                   :auth (foreign-slot-value settings 'settings 'auth)
+                                   :host (foreign-slot-value settings 'settings 'host))))
+      #+sbcl (sb-ext:finalize display (lambda ()
+                                        (foreign-funcall "brlapi__closeConnection" :pointer handle :void)
+                                        (foreign-free handle)))
+      display)))
+
+(defmethod close-connection ((obj display))
+  (foreign-funcall "brlapi__closeConnection" :pointer (display-handle obj) :void)
+  (setf (slot-value obj 'fd) nil)
+  (foreign-free (display-handle obj))
+  (setf (slot-value obj 'handle) nil))
+
+;;;; * Querying the display
+
+(defmethod driver-name ((obj display))
+  "Return the currently used driver name."
+  (with-foreign-pointer-as-string ((str str-size) 64)
+    (foreign-funcall "brlapi__getDriverName" :pointer (display-handle obj)
+                     :string str :int str-size brlapi-code)))
+
+(defmethod display-size ((obj display))
+  "Return the dimensions of DISPLAY as multiple values.
+The first value represents the x dimension and the second the y dimension."
+  (with-foreign-objects ((x :int) (y :int))
+    (foreign-funcall "brlapi__getDisplaySize" :pointer (display-handle obj) :pointer x :pointer y brlapi-code)
+    (values (mem-ref x :int) (mem-ref y :int))))
+
+
+;;;; * TTY mode
+
+(defmethod enter-tty-mode ((obj display) tty &optional (driver ""))
+  (declare (integer tty))
+  (declare (string driver))
+  (setf (slot-value obj 'tty) (foreign-funcall "brlapi__enterTtyMode" :pointer (display-handle obj) :int tty :string driver brlapi-code)))
+
+(defmethod leave-tty-mode ((obj display))
+  (foreign-funcall "brlapi__leaveTtyMode" :pointer (display-handle obj) brlapi-code)
+  (setf (slot-value obj 'tty) nil))
+
+
+;;;; * Output
+
+(defmethod write-text ((obj display) text &key (cursor -1))
+  "Write TEXT (a string) to the braille display."
+  (declare (string text))
+  (declare (integer cursor))
+  (if (eql (foreign-funcall "brlapi__writeText"
+                            :pointer (display-handle obj)
+                            :int cursor :string text
+                            brlapi-code)
+           0)
+      text))
+
+(defbitfield (dots :uint8)
+  (:dot1 #x01) :dot2 :dot3 :dot4 :dot5 :dot6 :dot7 :dot8)
+(defmethod write-dots ((obj display) &rest dots-list)
+  "Write the given dots list to the display."
+  (with-foreign-object (dots 'dots (display-size obj))
+    (loop for i below (min (display-size obj) (length dots-list))
+          do (setf (mem-aref dots 'dots i)
+                   (foreign-bitfield-value 'dots (nth i dots-list))))
+    (loop for i from (length dots-list) below (display-size obj)
+          do (setf (mem-aref dots 'dots i) 0))
+    (foreign-funcall "brlapi__writeDots" :pointer (display-handle obj) :pointer dots brlapi-code)))
+
+(defcstruct write-struct
+  (display-number :int)
+  (region-begin :int)
+  (region-size :int)
+  (text :pointer)
+  (attr-and :pointer)
+  (attr-or :pointer)
+  (cursor :int)
+  (charset :string))
+
+(defmethod write-region ((obj display) text &key (begin 1) size (cursor -1) (display-number -1)
+                         (charset "") attr-and attr-or)
+  "Update a specific region of the braille display and apply and/or masks."
+  (let ((size (or size (min (display-size obj)
+                            (max (length text)
+                                 (length attr-and)
+                                 (length attr-or))))))    
+    (with-foreign-objects ((ws 'write-struct)
+                           (txt :string (1+ size))
+                           (attra 'dots size)
+                           (attro 'dots size))
+      (loop for i below size
+            do (setf (mem-aref txt :uint8 i) (char-code #\SPACE)))
+      (setf (mem-aref txt :uint8 size) 0)
+      (loop for i below (min size (length text))
+            do (setf (mem-aref txt :uint8 i) (char-code (aref text i))))
+      (loop for i below size
+            do (setf (mem-aref attra :uint8 i) #XFF (mem-aref attro :uint8 i) 0))
+      (loop for i below (min size (length attr-and))
+            do (setf (mem-aref attra :uint8 i) (foreign-bitfield-value 'dots (nth i attr-and))))
+      (loop for i below (min size (length attr-or))
+            do (setf (mem-aref attro :uint8 i) (foreign-bitfield-value 'dots (nth i attr-or))))
+      (setf (foreign-slot-value ws 'write-struct 'display-number) display-number
+            (foreign-slot-value ws 'write-struct 'cursor) cursor
+            (foreign-slot-value ws 'write-struct 'region-begin) begin
+            (foreign-slot-value ws 'write-struct 'region-size) size
+            (foreign-slot-value ws 'write-struct 'charset) charset
+            (foreign-slot-value ws 'write-struct 'text) txt
+            (foreign-slot-value ws 'write-struct 'attr-or) attro
+            (foreign-slot-value ws 'write-struct 'attr-and) attra)
+      (eql (foreign-funcall "brlapi__write" :pointer (display-handle obj) :pointer ws brlapi-code) 0))))
+
+
+;;;; * Input
+
+(defctype key-code :uint64)
+(defmethod read-key ((obj display) &optional block)
+  (with-foreign-object (key 'key-code)
+    (case (foreign-funcall "brlapi__readKey" :pointer (display-handle obj) :boolean block :pointer key brlapi-code)
+      (0 nil)
+      (1 (mem-ref key 'key-code)))))
+
+(defun expand-key (code)
+  (with-foreign-objects ((command :int) (arg :int) (flags :int))
+    (foreign-funcall "brlapi_expandKeyCode"
+                     key-code code
+                     :pointer command :pointer arg :pointer flags
+                     :int)
+    (values (intern (foreign-funcall "brlapi_getKeyName"
+                                     :int (mem-ref command :int)
+                                     :int (mem-ref arg :int)
+                                     :string))
+            (mem-ref arg :int)
+            (mem-ref flags :int))))
+
+;;;; * Example usage
+
+(defun example (&optional (tty -1))
+  "A basic example."
+  (let ((display (open-connection)))
+    (enter-tty-mode display tty)
+    (write-text display "Press any key to continue...")
+    (apply #'format t "; Command: ~A, argument: ~D, flags: ~D"
+           (multiple-value-list (expand-key (read-key display t))))
+    (leave-tty-mode display)
+    (close-connection display)))
+
--- a/grub-core/braille/brltty/Bindings/Lisp/brlapi.lisp.in
+++ b/grub-core/braille/brltty/Bindings/Lisp/brlapi.lisp.in
@@ -0,0 +1,246 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; libbrlapi - A library providing access to braille terminals for applications.
+;
+; Copyright (C) 2006-2012 by Mario Lang <mlang@delysid.org>
+;
+; libbrlapi comes with ABSOLUTELY NO WARRANTY.
+;
+; This is free software, placed under the terms of the
+; GNU Lesser General Public License, as published by the Free Software
+; Foundation; either version 2.1 of the License, or (at your option) any
+; later version. Please see the file LICENSE-LGPL for details.
+;
+; Web Page: http://mielke.cc/brltty/
+;
+; This software is maintained by Dave Mielke <dave@mielke.cc>.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(eval-when (:compile-toplevel)
+  (declaim (optimize (safety 3) (debug 3))))
+
+;;;; * Package definition
+
+(defpackage :brlapi
+  (:use :common-lisp :cffi)
+  (:export #:open-connection #:close-connection
+	   #:driver-name #:display-size
+           #:enter-tty-mode #:leave-tty-mode
+           #:write-text #:write-dots #:write-region
+           #:read-key #:expand-key))
+(in-package :brlapi)
+
+
+;;;; * C BrlAPI Library loading
+
+(define-foreign-library libbrlapi
+  (:unix (:or "libbrlapi.@library_extension@.@api_release@" "libbrlapi.@library_extension@.@api_version@"))
+  (t (:default "libbrlapi")))
+(use-foreign-library libbrlapi)
+
+;;;; * The DISPLAY class
+
+(defclass display ()
+  ((handle :initarg :handle :reader display-handle)
+   (fd :initarg :fd :reader display-file-descriptor)
+   (auth :initarg :auth :reader display-auth)
+   (host :initarg :host :reader display-host)
+   (tty :initform nil :reader display-tty)))
+
+(defmethod print-object ((obj display) stream)
+  (print-unreadable-object (obj stream :type t)
+    (if (not (display-file-descriptor obj))
+        (format stream "disconnected")
+      (apply #'format stream "~Dx~D fd=~D, host=~A, driver=~A"
+             (concatenate 'list (multiple-value-list (display-size obj))
+                          (list (display-file-descriptor obj) (display-host obj)
+                                (driver-name obj)))))))
+
+
+;;;; * Error handling
+
+(defctype brlapi-code :int)
+(define-condition brlapi-error (error)
+  ((text :initarg :text :reader brlapi-error-text))
+  (:report (lambda (c stream)
+             (format stream "libbrlapi function returned ~A"
+                     (brlapi-error-text c))))
+  (:documentation "Signalled when a libbrlapi function answers with -1."))
+
+(defmethod translate-from-foreign (value (name (eql 'brlapi-code)))
+  "Raise a BRLAPI-ERROR if VALUE, a brlapi-code, is -1."
+  (declare (integer value))
+  (if (eql value -1)
+      (error 'brlapi-error
+             :text (foreign-funcall "brlapi_strerror"
+                                    :pointer
+                                    (foreign-funcall "brlapi_error_location"
+                                                     :pointer)
+                                    :string))
+    value))
+
+
+;;;; * Connection management
+
+(defcstruct settings
+  "Connection setting structure."
+  (auth :string)
+  (host :string))
+
+(defun open-connection (&optional auth host)
+  "Open a new connection to BRLTTY on HOST usng AUTH for authorization.
+Return a DISPLAY object which can further be used to interact with BRLTTY."
+  (with-foreign-object (settings 'settings)
+    (setf (foreign-slot-value settings 'settings 'auth)
+          (if (stringp auth) auth (null-pointer))
+          (foreign-slot-value settings 'settings 'host)
+          (if (stringp host) host (null-pointer)))
+    (let* ((handle (foreign-alloc :char :count (foreign-funcall "brlapi_getHandleSize" :int)))
+           (fd (foreign-funcall "brlapi__openConnection"
+                                :pointer handle
+                                :pointer settings
+                                :pointer settings
+                                brlapi-code))
+           (display (make-instance 'display :handle handle :fd fd
+                                   :auth (foreign-slot-value settings 'settings 'auth)
+                                   :host (foreign-slot-value settings 'settings 'host))))
+      #+sbcl (sb-ext:finalize display (lambda ()
+                                        (foreign-funcall "brlapi__closeConnection" :pointer handle :void)
+                                        (foreign-free handle)))
+      display)))
+
+(defmethod close-connection ((obj display))
+  (foreign-funcall "brlapi__closeConnection" :pointer (display-handle obj) :void)
+  (setf (slot-value obj 'fd) nil)
+  (foreign-free (display-handle obj))
+  (setf (slot-value obj 'handle) nil))
+
+;;;; * Querying the display
+
+(defmethod driver-name ((obj display))
+  "Return the currently used driver name."
+  (with-foreign-pointer-as-string ((str str-size) 64)
+    (foreign-funcall "brlapi__getDriverName" :pointer (display-handle obj)
+                     :string str :int str-size brlapi-code)))
+
+(defmethod display-size ((obj display))
+  "Return the dimensions of DISPLAY as multiple values.
+The first value represents the x dimension and the second the y dimension."
+  (with-foreign-objects ((x :int) (y :int))
+    (foreign-funcall "brlapi__getDisplaySize" :pointer (display-handle obj) :pointer x :pointer y brlapi-code)
+    (values (mem-ref x :int) (mem-ref y :int))))
+
+
+;;;; * TTY mode
+
+(defmethod enter-tty-mode ((obj display) tty &optional (driver ""))
+  (declare (integer tty))
+  (declare (string driver))
+  (setf (slot-value obj 'tty) (foreign-funcall "brlapi__enterTtyMode" :pointer (display-handle obj) :int tty :string driver brlapi-code)))
+
+(defmethod leave-tty-mode ((obj display))
+  (foreign-funcall "brlapi__leaveTtyMode" :pointer (display-handle obj) brlapi-code)
+  (setf (slot-value obj 'tty) nil))
+
+
+;;;; * Output
+
+(defmethod write-text ((obj display) text &key (cursor -1))
+  "Write TEXT (a string) to the braille display."
+  (declare (string text))
+  (declare (integer cursor))
+  (if (eql (foreign-funcall "brlapi__writeText"
+                            :pointer (display-handle obj)
+                            :int cursor :string text
+                            brlapi-code)
+           0)
+      text))
+
+(defbitfield (dots :uint8)
+  (:dot1 #x01) :dot2 :dot3 :dot4 :dot5 :dot6 :dot7 :dot8)
+(defmethod write-dots ((obj display) &rest dots-list)
+  "Write the given dots list to the display."
+  (with-foreign-object (dots 'dots (display-size obj))
+    (loop for i below (min (display-size obj) (length dots-list))
+          do (setf (mem-aref dots 'dots i)
+                   (foreign-bitfield-value 'dots (nth i dots-list))))
+    (loop for i from (length dots-list) below (display-size obj)
+          do (setf (mem-aref dots 'dots i) 0))
+    (foreign-funcall "brlapi__writeDots" :pointer (display-handle obj) :pointer dots brlapi-code)))
+
+(defcstruct write-struct
+  (display-number :int)
+  (region-begin :int)
+  (region-size :int)
+  (text :pointer)
+  (attr-and :pointer)
+  (attr-or :pointer)
+  (cursor :int)
+  (charset :string))
+
+(defmethod write-region ((obj display) text &key (begin 1) size (cursor -1) (display-number -1)
+                         (charset "") attr-and attr-or)
+  "Update a specific region of the braille display and apply and/or masks."
+  (let ((size (or size (min (display-size obj)
+                            (max (length text)
+                                 (length attr-and)
+                                 (length attr-or))))))    
+    (with-foreign-objects ((ws 'write-struct)
+                           (txt :string (1+ size))
+                           (attra 'dots size)
+                           (attro 'dots size))
+      (loop for i below size
+            do (setf (mem-aref txt :uint8 i) (char-code #\SPACE)))
+      (setf (mem-aref txt :uint8 size) 0)
+      (loop for i below (min size (length text))
+            do (setf (mem-aref txt :uint8 i) (char-code (aref text i))))
+      (loop for i below size
+            do (setf (mem-aref attra :uint8 i) #XFF (mem-aref attro :uint8 i) 0))
+      (loop for i below (min size (length attr-and))
+            do (setf (mem-aref attra :uint8 i) (foreign-bitfield-value 'dots (nth i attr-and))))
+      (loop for i below (min size (length attr-or))
+            do (setf (mem-aref attro :uint8 i) (foreign-bitfield-value 'dots (nth i attr-or))))
+      (setf (foreign-slot-value ws 'write-struct 'display-number) display-number
+            (foreign-slot-value ws 'write-struct 'cursor) cursor
+            (foreign-slot-value ws 'write-struct 'region-begin) begin
+            (foreign-slot-value ws 'write-struct 'region-size) size
+            (foreign-slot-value ws 'write-struct 'charset) charset
+            (foreign-slot-value ws 'write-struct 'text) txt
+            (foreign-slot-value ws 'write-struct 'attr-or) attro
+            (foreign-slot-value ws 'write-struct 'attr-and) attra)
+      (eql (foreign-funcall "brlapi__write" :pointer (display-handle obj) :pointer ws brlapi-code) 0))))
+
+
+;;;; * Input
+
+(defctype key-code :uint64)
+(defmethod read-key ((obj display) &optional block)
+  (with-foreign-object (key 'key-code)
+    (case (foreign-funcall "brlapi__readKey" :pointer (display-handle obj) :boolean block :pointer key brlapi-code)
+      (0 nil)
+      (1 (mem-ref key 'key-code)))))
+
+(defun expand-key (code)
+  (with-foreign-objects ((command :int) (arg :int) (flags :int))
+    (foreign-funcall "brlapi_expandKeyCode"
+                     key-code code
+                     :pointer command :pointer arg :pointer flags
+                     :int)
+    (values (intern (foreign-funcall "brlapi_getKeyName"
+                                     :int (mem-ref command :int)
+                                     :int (mem-ref arg :int)
+                                     :string))
+            (mem-ref arg :int)
+            (mem-ref flags :int))))
+
+;;;; * Example usage
+
+(defun example (&optional (tty -1))
+  "A basic example."
+  (let ((display (open-connection)))
+    (enter-tty-mode display tty)
+    (write-text display "Press any key to continue...")
+    (apply #'format t "; Command: ~A, argument: ~D, flags: ~D"
+           (multiple-value-list (expand-key (read-key display t))))
+    (leave-tty-mode display)
+    (close-connection display)))
+
--- a/grub-core/braille/brltty/Bindings/OCaml/META
+++ b/grub-core/braille/brltty/Bindings/OCaml/META
@@ -0,0 +1,5 @@
+requires = "unix"
+description = "Bindings for the libbrlapi braille enabling library"
+archive(byte) = "brlapi.cma"
+archive(native) = "brlapi.cmxa"
+version = "0.1"
--- a/grub-core/braille/brltty/Bindings/OCaml/bindings.m4
+++ b/grub-core/braille/brltty/Bindings/OCaml/bindings.m4
@@ -0,0 +1,156 @@
+# autoconf input for Objective Caml programs
+# Copyright (C) 2001 Jean-Christophe Filli<6C>tre
+#   from a first script by Georges Mariano 
+# 
+# Modified to be an autoconf m4 function in 2006
+# for BRLTTY [http://mielke.cc/brltty/]
+# by Dave Mielke <dave@mielke.cc>
+# 
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License version 2, as published by the Free Software Foundation.
+# 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# 
+# See the GNU Library General Public License version 2 for more details
+# (enclosed in the file LGPL).
+
+# the script generated by autoconf from this input will set the following
+# variables:
+#   OCAMLC        "ocamlc" if present in the path, or a failure
+#                 or "ocamlc.opt" if present with same version number as ocamlc
+#   OCAMLOPT      "ocamlopt" (or "ocamlopt.opt" if present), or "no"
+#   OCAMLMKLIB      "ocamlkmlib", or "no"
+#   OCAMLBEST     either "byte" if no native compiler was found, 
+#                 or "opt" otherwise
+#   OCAMLDEP      "ocamldep"
+#   OCAMLLEX      "ocamllex" (or "ocamllex.opt" if present)
+#   OCAMLYACC     "ocamlyac"
+#   OCAMLLIB      the path to the ocaml standard library
+#   OCAMLVERSION  the ocaml version number
+#   OCAMLWEB      "ocamlweb" (not mandatory)
+#   OCAMLWIN32    "yes"/"no" depending on Sys.os_type = "Win32"
+
+AC_DEFUN([BRLTTY_OCAML_BINDINGS], [dnl
+# Check for Ocaml compilers
+
+# we first look for ocamlc in the path; if not present, we fail
+AC_CHECK_PROG(OCAMLC,ocamlc,ocamlc,no)
+if test "$OCAMLC" = no ; then
+    AC_MSG_WARN([Cannot find ocamlc.])
+    OCAML_OK=false
+else
+    # checking for ocamlmklib
+    AC_CHECK_PROG(OCAMLMKLIB,ocamlmklib,ocamlmklib,no)
+    if test "$OCAMLMKLIB" = no ; then
+        AC_MSG_WARN([Cannot find ocamlmklib.])
+        OCAML_OK=false
+    else    
+        OCAML_OK=true
+        # we extract Ocaml version number and library path
+        OCAMLVERSION=`$OCAMLC -version`
+        AC_MSG_NOTICE([OCaml version is $OCAMLVERSION])
+
+        OCAMLLIB=`$OCAMLC -where`
+        AC_MSG_NOTICE([OCaml library path is $OCAMLLIB])
+
+        # then we look for ocamlopt; if not present, we issue a warning
+        # if the version is not the same, we also discard it
+        # we set OCAMLBEST to "opt" or "byte", whether ocamlopt is available or not
+        AC_CHECK_PROG(OCAMLOPT,ocamlopt,ocamlopt,no)
+        OCAMLBEST=byte
+        OCAML_NCLIB=
+        if test "$OCAMLOPT" = no ; then
+            AC_MSG_WARN([Cannot find ocamlopt; bytecode compilation only.])
+        else
+            AC_MSG_CHECKING(ocamlopt version)
+            TMPVERSION=`$OCAMLOPT -v | sed -n -e 's|.*version *\(.*\)$|\1|p' `
+            if test "$TMPVERSION" != "$OCAMLVERSION" ; then
+                AC_MSG_RESULT(differs from ocamlc; ocamlopt discarded.)
+                OCAMLOPT=no
+            else
+                AC_MSG_RESULT(ok)
+                OCAMLBEST=opt
+                OCAML_NCLIB="\$(OCAML_LIB).cmxa"
+            fi
+        fi
+
+        # checking for ocamlc.opt
+        AC_CHECK_PROG(OCAMLCDOTOPT,ocamlc.opt,ocamlc.opt,no)
+        if test "$OCAMLCDOTOPT" != no ; then
+            AC_MSG_CHECKING(ocamlc.opt version)
+            TMPVERSION=`$OCAMLCDOTOPT -v | sed -n -e 's|.*version *\(.*\)$|\1|p' `
+            if test "$TMPVERSION" != "$OCAMLVERSION" ; then
+                AC_MSG_RESULT(differs from ocamlc; ocamlc.opt discarded.)
+            else
+                AC_MSG_RESULT(ok)
+                OCAMLC=$OCAMLCDOTOPT
+            fi
+        fi
+
+        # checking for ocamlopt.opt
+        if test "$OCAMLOPT" != no ; then
+            AC_CHECK_PROG(OCAMLOPTDOTOPT,ocamlopt.opt,ocamlopt.opt,no)
+            if test "$OCAMLOPTDOTOPT" != no ; then
+                AC_MSG_CHECKING(ocamlc.opt version)
+                TMPVER=`$OCAMLOPTDOTOPT -v | sed -n -e 's|.*version *\(.*\)$|\1|p' `
+                if test "$TMPVER" != "$OCAMLVERSION" ; then
+                    AC_MSG_RESULT(differs from ocamlc; ocamlopt.opt discarded.)
+                else
+                    AC_MSG_RESULT(ok)
+                    OCAMLOPT=$OCAMLOPTDOTOPT
+                fi
+            fi
+        fi
+
+        # platform
+        AC_MSG_CHECKING(platform)
+        if echo "let _ = Sys.os_type;;" | ocaml | grep -q Win32; then
+            AC_MSG_RESULT(Win32)
+            OCAMLWIN32=yes
+            OCAML_CLIBS=libbrlapi_stubs.a
+        elif echo "let _ = Sys.os_type;;" | ocaml | grep -q Cygwin; then
+            AC_MSG_RESULT(Cygwin)
+            OCAMLWIN32=yes
+            OCAML_CLIBS=libbrlapi_stubs.a
+        else
+            AC_MSG_RESULT(Unix)
+            OCAMLWIN32=no
+            OCAML_CLIBS="libbrlapi_stubs.a dllbrlapi_stubs.so"
+        fi
+    
+        # checking for ocamlfindlib
+        AC_CHECK_PROG(OCAMLFIND,ocamlfind,ocamlfind,no)
+        if test "$OCAMLFIND" = ocamlfind; then
+            OCAMLC='ocamlfind ocamlc'
+            if test "$OCAMLOPT" = ocamlopt; then
+                OCAMLOPT='ocamlfind ocamlopt'
+            fi
+            OCAML_INSTALL_TARGET=install-with-findlib
+            OCAML_UNINSTALL_TARGET=uninstall-without-findlib
+        else
+            OCAML_INSTALL_TARGET=install-without-findlib
+            OCAML_UNINSTALL_TARGET=uninstall-without-findlib
+            AC_MSG_WARN([Cannot find ocamlfind.])
+        fi
+    fi
+fi
+
+# substitutions to perform
+AC_SUBST(OCAMLC)
+AC_SUBST(OCAMLOPT)
+AC_SUBST(OCAMLMKLIB)
+AC_SUBST(OCAMLBEST)
+AC_SUBST(OCAMLVERSION)
+AC_SUBST(OCAMLLIB)
+AC_SUBST(OCAMLWIN32)
+AC_SUBST(OCAML_CLIBS)
+AC_SUBST(OCAML_NCLIB)
+AC_SUBST(OCAMLFIND)
+AC_SUBST(OCAML_INSTALL_TARGET)
+AC_SUBST(OCAML_UNINSTALL_TARGET)
+
+AC_SUBST([OCAML_OK])
+])
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vladimir Serbinenko	7699d54233	Several fixes	2013-10-28 17:42:40 +01:00
Vladimir Serbinenko	951ce61283	Revert few useless changes	2013-10-28 17:06:27 +01:00
Vladimir Serbinenko	7bda71ce3c	Fix file list	2013-10-28 17:03:22 +01:00
Vladimir Serbinenko	e79b5f2678	Supporting infrastructure for brltty	2013-10-28 16:49:58 +01:00
Vladimir Serbinenko	16fba4d65d	Import brltty	2013-10-28 16:46:36 +01:00