Some scribbles on EFI compression

selectively skipping systems.

.bzrignore

@@ -1,65 +0,0 @@
-00_header
-10_*
-30_os-prober
-40_custom
-aclocal.m4
-autom4te.cache
-build_env.mk
-.bzrignore
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-conf/*.mk
-conf/gcry.rmk
-*.d
-DISTLIST
-docs/*.info
-docs/stamp-vti
-docs/version.texi
-*.elf
-*.exec
-genkernsyms.sh
-gensymlist.sh
-grub-dumpbios
-grub-editenv
-grub-emu
-grub_emu_init.c
-grub_emu_init.h
-grub-fstest
-grub_fstest_init.c
-grub_fstest_init.h
-grub-install
-grub-mk*
-grub-pbkdf2
-grub-pe2elf
-grub-probe
-grub_probe_init.c
-grub_probe_init.h
-grub_script.tab.c
-grub_script.tab.h
-grub-setup
-grub_setup_init.c
-grub_setup_init.h
-*.img
-include/grub/cpu
-include/grub/machine
-install-sh
-lib/libgcrypt-grub
-*.lst
-Makefile
-*.mod
-mod-*.c
-missing
-*.pf2
-po/*.mo
-po/grub.pot
-stamp-h
-stamp-h1
-stamp-h.in
-symlist.c
-update-grub_lib

.gitignore

@@ -0,0 +1,225 @@
+00_header
+10_*
+20_linux_xen
+30_os-prober
+40_custom
+41_custom
+*.1
+*.8
+aclocal.m4
+ahci_test
+ascii.bitmaps
+ascii.h
+autom4te.cache
+build_env.mk
+build-grub-gen-asciih
+build-grub-gen-widthspec
+build-grub-mkfont
+cdboot_test
+cmp_test
+config.cache
+config.guess
+config.h
+config-util.h
+config-util.h.in
+config.log
+config.status
+config.sub
+configure
+core_compress_test
+DISTLIST
+docs/*.info
+docs/stamp-vti
+docs/version.texi
+ehci_test
+*.elf
+example_grub_script_test
+example_scripted_test
+example_unit_test
+*.exec
+fddboot_test
+genkernsyms.sh
+gensymlist.sh
+gentrigtables
+gettext_strings_test
+grub-bin2h
+grub-bios-setup
+grub_cmd_date
+grub_cmd_echo
+grub_cmd_regexp
+grub_cmd_set_date
+grub_cmd_sleep
+grub-editenv
+grub-emu
+grub-emu-lite
+grub_emu_init.c
+grub_emu_init.h
+grub-fstest
+grub_fstest_init.c
+grub_fstest_init.h
+grub_func_test
+grub-install
+grub-kbdcomp
+grub-macho2img
+grub-menulst2cfg
+/grub-mk*
+grub-mount
+grub-ofpathname
+grub-pe2elf
+grub-probe
+grub_probe_init.c
+grub_probe_init.h
+grub-reboot
+grub_script_blanklines
+grub_script_blockarg
+grub_script_break
+grub-script-check
+grub_script_check_init.c
+grub_script_check_init.h
+grub_script_comments
+grub_script_continue
+grub_script_dollar
+grub_script_echo1
+grub_script_echo_keywords
+grub_script_escape_comma
+grub_script_eval
+grub_script_expansion
+grub_script_final_semicolon
+grub_script_for1
+grub_script_functions
+grub_script_gettext
+grub_script_if
+grub_script_leading_whitespace
+grub_script_no_commands
+grub_script_not
+grub_script_return
+grub_script_setparams
+grub_script_shift
+grub_script_strcmp
+grub_script_test
+grub_script_vars1
+grub_script_while1
+grub_script.tab.c
+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
+gzcompress_test
+hddboot_test
+help_test
+*.img
+*.image
+include/grub/cpu
+include/grub/machine
+install-sh
+lib/libgcrypt-grub
+libgrub_a_init.c
+*.log
+*.lst
+lzocompress_test
+*.marker
+Makefile
+*.mod
+mod-*.c
+missing
+netboot_test
+*.o
+*.a
+ohci_test
+partmap_test
+pata_test
+*.pf2
+*.pp
+po/*.mo
+po/grub.pot
+po/POTFILES
+po/stamp-po
+printf_test
+priority_queue_unit_test
+pseries_test
+stamp-h
+stamp-h1
+stamp-h.in
+symlist.c
+symlist.h
+trigtables.c
+*.trs
+uhci_test
+update-grub_lib
+unidata.c
+xzcompress_test
+Makefile.in
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+Makefile.tpl
+compile
+depcomp
+mdate-sh
+texinfo.tex
+grub-core/lib/libgcrypt-grub
+.deps
+.deps-util
+.deps-core
+.dirstamp
+Makefile.util.am
+contrib
+grub-core/bootinfo.txt
+grub-core/Makefile.core.am
+grub-core/Makefile.gcry.def
+grub-core/contrib
+grub-core/gdb_grub
+grub-core/genmod.sh
+grub-core/gensyminfo.sh
+grub-core/gmodule.pl
+grub-core/grub.chrp
+grub-core/modinfo.sh
+grub-core/*.module
+grub-core/*.pp
+util/bash-completion.d/grub
+grub-core/gnulib/alloca.h
+grub-core/gnulib/arg-nonnull.h
+grub-core/gnulib/c++defs.h
+grub-core/gnulib/charset.alias
+grub-core/gnulib/configmake.h
+grub-core/gnulib/float.h
+grub-core/gnulib/getopt.h
+grub-core/gnulib/langinfo.h
+grub-core/gnulib/ref-add.sed
+grub-core/gnulib/ref-del.sed
+grub-core/gnulib/stdio.h
+grub-core/gnulib/stdlib.h
+grub-core/gnulib/string.h
+grub-core/gnulib/strings.h
+grub-core/gnulib/sys
+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.S
+widthspec.bin
+widthspec.h
+docs/stamp-1
+docs/version-dev.texi
+Makefile.utilgcry.def
+po/*.po
+po/*.gmo
+po/LINGUAS
+po/remove-potcdate.sed
+include/grub/gcrypt/gcrypt.h
+include/grub/gcrypt/g10lib.h
+po/POTFILES.in
+po/POTFILES-shell.in
+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

ABOUT-NLS

@@ -0,0 +1,223 @@
+1 Notes on the Free Translation Project
+***************************************
+
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work on translations can contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+1.1 Quick configuration advice
+==============================
+
+If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias, message inheritance, automatic
+charset conversion or plural form handling) as the implementation here.
+It is also not possible to offer this additional functionality on top
+of a `catgets' implementation.  Future versions of GNU `gettext' will
+very likely convey even more functionality.  So it might be a good idea
+to change to GNU `gettext' as soon as possible.
+
+   So you need _not_ provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+1.2 INSTALL Matters
+===================
+
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system already
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --disable-nls
+
+will, respectively, bypass any pre-existing `gettext' to use the
+internationalizing routines provided within this package, or else,
+_totally_ disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   The configuration process will not test for the `catgets' function
+and therefore it will not be used.  The reason is that even an
+emulation of `gettext' on top of `catgets' could not provide all the
+extensions of the GNU `gettext' library.
+
+   Internationalized packages usually have many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+1.3 Using This Package
+======================
+
+As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
+and `CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
+
+   Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
+
+1.4 Translating Teams
+=====================
+
+For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list.  The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
+area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
+
+1.5 Available Packages
+======================
+
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of October
+2006.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a
+translation percentage of at least 50%.
+
+# Matrix here is removed!
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If October 2006 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
+matrix with full percentage details can be found at
+`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
+
+1.6 Using `gettext' in new packages
+===================================
+
+If you are writing a freely available program and want to
+internationalize it you are welcome to use GNU `gettext' in your
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.
+
+   Once the sources are changed appropriately and the setup can handle
+the use of `gettext' the only thing missing are the translations.  The
+Free Translation Project is also available for packages which are not
+developed inside the GNU project.  Therefore the information given above
+applies also for every other Free Software Project.  Contact
+`translation@iro.umontreal.ca' to make the `.pot' files available to
+the translation teams.
+

BUGS

@@ -0,0 +1,7 @@
+GRUB team is aware of following problems:
+  - Currently search and assembling multidevice abstractions scans
+    all the devices which can be slow.
+  - Cache isn't used correctly for video which results in slowness.
+
+While these are bugs their solution has a potential of breaking more and more
+seriously. So it was decided for 1.99 that they aren't fixed.

INSTALL

@@ -12,23 +12,45 @@ 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
+  Note: clang 3.2 or later works for i386 and x86_64 targets but results in
+        much bigger binaries.
+  Note: clang 3.2 or later works for arm
+  Note: clang 3.4 or later works for powerpc
 * 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
 
+On GNU/Linux, you also need:
+
+* libdevmapper 1.02.34 or later (recommended)
+
+For optional grub-emu features, you need:
+
+* SDL (recommended)
+* libpciaccess (optional)
+* libusb (optional)
+
+To build GRUB's graphical terminal (gfxterm), you need:
+
+* FreeType 2 or later
+* GNU Unifont
+
 If you use a development snapshot or want to hack on GRUB you may
 need the following.
 
-* Ruby 1.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:
 
 * qemu, specifically the binary 'qemu-system-i386'
+* xorriso 1.2.9 or later, for grub-mkrescue and grub-shell
 
 Configuring the GRUB
 ====================
@@ -59,9 +81,14 @@ Building the GRUB
 
 The simplest way to compile this package is:
 
-  1. `cd' to the directory containing the package's source code.  If
-     you don't use a release tarball you have to type `./autogen.sh'.
-     Type `./configure' to configure the package for your system.
+  1. `cd' to the directory containing the package's source code.
+
+  2. Skip this and following step if you use release tarball and proceed to
+     step 4. If you want translations type `./linguas.sh'.
+  
+  3. Type `./autogen.sh'.
+
+  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
      to execute `configure' itself.
@@ -69,15 +96,15 @@ The simplest way to compile this package is:
      Running `configure' takes awhile.  While running, it prints some
      messages telling which features it is checking for.
 
-  2. Type `make' to compile the package.
+  6. Type `make' to compile the package.
 
-  3. Optionally, type `make check' to run any self-tests that come with
+  7. Optionally, type `make check' to run any self-tests that come with
      the package.
 
-  4. Type `make install' to install the programs and any data files and
+  8. Type `make install' to install the programs and any data files and
      documentation.
 
-  5. You can remove the program binaries and object files from the
+  9. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -86,6 +113,87 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+Cross-compiling the GRUB
+========================
+
+GRUB defines 3 platforms:
+
+  - "Build" is the one which build systems runs on.
+  - "Host" is where you execute GRUB utils.
+  - "Target" is where GRUB itself runs.
+
+For grub-emu host and target must be the same but may differ from build.
+
+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 developpers running amd64 GNU/Linux laptop and
+they need to make images for ARM board running U-boot. In this case:
+
+build=sparc64-freebsd
+host=amd64-linux-gnu
+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 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
+--target=arm --with-platform=uboot TARGET_CC=arm-elf-gcc
+TARGET_CFLAGS="-Os -march=armv6" TARGET_CCASFLAGS="-march=armv6"
+TARGET_OBJCOPY="arm-elf-objcopy" TARGET_STRIP="arm-elf-strip"
+TARGET_NM=arm-elf-nm TARGET_RANLIB=arm-elf-ranlib LEX=gflex
+
+You need to use following options to specify tools and platforms. For minimum
+version look at prerequisites. All tools not mentioned in this section under
+corresponding platform are not needed for the platform in question.
+
+  - For build
+    1. BUILD_CC= to gcc able to compile for build. This is used, for
+       example, to compile build-gentrigtables which is then run to
+       generate sin and cos tables.
+    2. BUILD_CFLAGS= for C options for build.
+    3. BUILD_CPPFLAGS= for C preprocessor options for build.
+    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. 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).
+    9. Libzfs if any must be in standard linker folders (-lzfs) (optional).
+    10. Liblzma if any must be in standard linker folders (-llzma) (optional).
+
+  - For target
+    1. --target= to autoconf cpu name of target.
+    2. --with-platform to choose firmware.
+    3. TARGET_CC= for gcc able to compile for target
+    4. TARGET_CFLAGS= for C options for target.
+    5. TARGET_CPPFLAGS= for C preprocessor options for target.
+    6. TARGET_CCASFLAGS= for assembler options for target.
+    7. TARGET_LDFLAGS= for linker options for target.
+    8. TARGET_OBJCOPY= for objcopy for target.
+    9. TARGET_STRIP= for strip for target.
+    10. TARGET_NM= for nm for target.
+    11. TARGET_RANLIB= for ranlib for target.
+
+  - Additionally for emu, for host and target.
+    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.
+    2. Bison is specified in YACC= variable
+    3. Flex is specified in LEX= variable
+    4. GNU unifont and Djvu sans are looked for in standard directories.
 
 Compiling For Multiple Architectures
 ====================================

Makefile.am

@@ -0,0 +1,428 @@
+AUTOMAKE_OPTIONS = subdir-objects -Wno-portability
+
+DEPDIR = .deps-util
+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
+
+AM_CFLAGS = $(HOST_CFLAGS)
+AM_LDFLAGS = $(HOST_LDFLAGS)
+AM_CPPFLAGS = $(HOST_CPPFLAGS) $(CPPFLAGS_DEFAULT)
+AM_CCASFLAGS = $(HOST_CCASFLAGS) $(CCASFLAGS_DEFAULT)
+
+ACLOCAL_AMFLAGS = -I m4
+
+CFLAGS_PROGRAM += $(CFLAGS_GNULIB)
+LDFLAGS_PROGRAM += $(LDFLAGS_GNULIB)
+CPPFLAGS_PROGRAM += $(CPPFLAGS_GNULIB)
+CCASFLAGS_PROGRAM += $(CCASFLAGS_GNULIB)
+
+include $(srcdir)/Makefile.util.am
+
+# XXX Use Automake's LEX & YACC support
+grub_script.tab.h: $(top_srcdir)/grub-core/script/parser.y
+	$(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/grub-core/script/parser.y
+grub_script.tab.c: grub_script.tab.h
+CLEANFILES += grub_script.tab.c grub_script.tab.h
+
+# For the lexer.
+grub_script.yy.h: $(top_srcdir)/grub-core/script/yylex.l
+	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/grub-core/script/yylex.l
+grub_script.yy.c: grub_script.yy.h
+CLEANFILES += grub_script.yy.c grub_script.yy.h
+
+# For libgrub.a
+libgrub.pp: grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgrubmods_a_CPPFLAGS) $(libgrubkern_a_CPPFLAGS) $(CPPFLAGS) \
+	  -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1)
+CLEANFILES += libgrub.pp
+
+libgrub_a_init.lst: libgrub.pp
+	cat $< | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1)
+CLEANFILES += libgrub_a_init.lst
+
+libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh
+	sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
+CLEANFILES += libgrub_a_init.c
+
+# For grub-fstest
+grub_fstest.pp: $(grub_fstest_SOURCES)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(grub_fstest_CPPFLAGS) $(CPPFLAGS) \
+	  -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1)
+CLEANFILES += grub_fstest.pp
+
+grub_fstest_init.lst: libgrub.pp grub_fstest.pp
+	cat $^ | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1)
+CLEANFILES += grub_fstest_init.lst
+
+grub_fstest_init.c: grub_fstest_init.lst $(top_srcdir)/geninit.sh
+	sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
+CLEANFILES += grub_fstest_init.c
+
+if COND_HAVE_FONT_SOURCE
+pkgdata_DATA += unicode.pf2 ascii.pf2 euro.pf2 ascii.h widthspec.h
+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: 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)
+CLEANFILES += build-grub-mkfont
+
+garbage-gen: util/garbage-gen.c
+	$(BUILD_CC) -o $@ $(BUILD_CFLAGS) $(BUILD_CPPFLAGS)  $^
+CLEANFILES += garbage-gen
+
+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
+CLEANFILES += build-grub-gen-asciih
+
+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
+CLEANFILES += build-grub-gen-widthspec
+
+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-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 =
+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-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-grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
+CLEANFILES += ascii.pf2
+
+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-grub-gen-asciih $(FONT_SOURCE) $@
+CLEANFILES += ascii.h
+
+widthspec.h: $(FONT_SOURCE) build-grub-gen-widthspec
+	./build-grub-gen-widthspec $(FONT_SOURCE) $@
+CLEANFILES += widthspec.h
+
+# Install config.h into platformdir
+platform_HEADERS = config.h
+
+pkgdata_DATA += grub-mkconfig_lib
+
+
+if COND_i386_coreboot
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_multiboot
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_ieee1275
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_qemu
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_pc
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_efi
+QEMU32=qemu-system-i386
+endif
+
+if COND_x86_64_efi
+QEMU32=qemu-system-x86_64
+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 $@ $< -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 $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+linux.init.mips: $(srcdir)/grub-core/tests/boot/linux.init-mips.S
+	$(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 $@ $< -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+linux.init.mipsel: $(srcdir)/grub-core/tests/boot/linux.init-mips.S
+	$(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 $@ $< -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)\" -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)\" -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 $< $@ -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 $@ $< -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)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0 -m32
+
+ntldr.bin: ntldr.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 $< $@;
+
+multiboot2.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)\" -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 -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 -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 -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 -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 -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 -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 --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 --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 --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 --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 --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 --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
+
+knetbsd.image.i386: knetbsd.init.i386 $(srcdir)/grub-core/tests/boot/kbsd.spec.txt
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -F $(srcdir)/grub-core/tests/boot/kbsd.spec.txt -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
+
+kopenbsd.image.i386: kopenbsd.init.i386 $(srcdir)/grub-core/tests/boot/kopenbsdlabel.txt
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -F $(srcdir)/grub-core/tests/boot/kbsd.spec.txt -t ffs -s 128k -f 10 -o minfree=0,version=1 $@ $$TDIR && bsdlabel -f -R $@ $(srcdir)/grub-core/tests/boot/kopenbsdlabel.txt && rm -rf $$TDIR || rm -f $@
+
+kopenbsd.image.x86_64: kopenbsd.init.x86_64 $(srcdir)/grub-core/tests/boot/kopenbsdlabel.txt
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -F $(srcdir)/grub-core/tests/boot/kbsd.spec.txt -t ffs -s 128k -f 10 -o minfree=0,version=1 $@ $$TDIR && bsdlabel -f -R $@ $(srcdir)/grub-core/tests/boot/kopenbsdlabel.txt && rm -rf $$TDIR || rm -f $@
+
+knetbsd.miniroot-image.i386.img: knetbsd.image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386
+	$(TARGET_OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386 $@
+
+kfreebsd-mfsroot.x86_64.img: kfreebsd.init.x86_64 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
+
+knetbsd.image.x86_64: knetbsd.init.x86_64 $(srcdir)/grub-core/tests/boot/kbsd.spec.txt
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -F $(srcdir)/grub-core/tests/boot/kbsd.spec.txt -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
+
+knetbsd.miniroot-image.x86_64.img: knetbsd.image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64
+	$(TARGET_OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64 $@
+
+CLEANFILES += linux.init.i386 kfreebsd.init.i386 linux.init.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
+
+kfreebsd-mfsroot.i386.gz: kfreebsd-mfsroot.i386.img
+	gzip < $< > $@
+
+bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386.gz $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/grub-core/tests/boot/kfreebsd.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=$(QEMU32) --files=/mfsroot.gz=kfreebsd-mfsroot.i386.gz --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/grub-core/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+kfreebsd-mfsroot.x86_64.gz: kfreebsd-mfsroot.x86_64.img
+	gzip < $< > $@
+
+bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64.gz $(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/grub-core/tests/boot/kfreebsd.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=qemu-system-x86_64 --files=/mfsroot.gz=kfreebsd-mfsroot.x86_64.gz --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/grub-core/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+knetbsd.miniroot-image.i386.gz: knetbsd.miniroot-image.i386.img
+	gzip < $< > $@
+
+bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386.gz $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/grub-core/tests/boot/knetbsd.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=$(QEMU32) --files=/miniroot.gz=knetbsd.miniroot-image.i386.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/grub-core/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-kopenbsd-i386: kopenbsd.image.i386 $(GRUB_PAYLOADS_DIR)/kopenbsd.i386 $(srcdir)/grub-core/tests/boot/kopenbsd.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=$(QEMU32) --files=/ramdisk=kopenbsd.image.i386 --files=/kopenbsd=$(GRUB_PAYLOADS_DIR)/kopenbsd.i386 $(srcdir)/grub-core/tests/boot/kopenbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-kopenbsd-x86_64: kopenbsd.image.x86_64 $(GRUB_PAYLOADS_DIR)/kopenbsd.x86_64 $(srcdir)/grub-core/tests/boot/kopenbsd.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=qemu-system-x86_64 --files=/ramdisk=kopenbsd.image.x86_64 --files=/kopenbsd=$(GRUB_PAYLOADS_DIR)/kopenbsd.x86_64 $(srcdir)/grub-core/tests/boot/kopenbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+knetbsd.miniroot-image.x86_64.gz: knetbsd.miniroot-image.x86_64.img
+	gzip < $< > $@
+
+bootcheck-knetbsd-x86_64: knetbsd.miniroot-image.x86_64.gz $(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/grub-core/tests/boot/knetbsd.cfg grub-shell
+	./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 | 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
+
+bootcheck-linux-mips: linux-initramfs.mips $(GRUB_PAYLOADS_DIR)/linux.mips $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --files=/initrd=linux-initramfs.mips --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.mips $(srcdir)/grub-core/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux-ppc: linux-initramfs.ppc $(GRUB_PAYLOADS_DIR)/linux.ppc $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --files=/initrd=linux-initramfs.ppc --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.ppc $(srcdir)/grub-core/tests/boot/linux-ppc.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux-mipsel: linux-initramfs.mipsel $(GRUB_PAYLOADS_DIR)/linux.mipsel $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --files=/initrd=linux-initramfs.mipsel --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.mipsel $(srcdir)/grub-core/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux-loongson: linux-initramfs.loongson $(GRUB_PAYLOADS_DIR)/linux.loongson $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --files=/initrd=linux-initramfs.loongson --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.loongson $(srcdir)/grub-core/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux16-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/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux16-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/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-multiboot: multiboot.elf $(srcdir)/grub-core/tests/boot/multiboot.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=$(QEMU32) --files=/multiboot.elf=multiboot.elf $(srcdir)/grub-core/tests/boot/multiboot.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-multiboot2: multiboot2.elf $(srcdir)/grub-core/tests/boot/multiboot2.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=$(QEMU32) --files=/multiboot2.elf=multiboot2.elf $(srcdir)/grub-core/tests/boot/multiboot2.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-kfreebsd-aout: kfreebsd.aout $(srcdir)/grub-core/tests/boot/kfreebsd-aout.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=$(QEMU32) --files=/kfreebsd.aout=kfreebsd.aout $(srcdir)/grub-core/tests/boot/kfreebsd-aout.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-pc-chainloader: pc-chainloader.bin $(srcdir)/grub-core/tests/boot/pc-chainloader.cfg grub-shell
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=$(QEMU32) --files=/pc-chainloader.bin=pc-chainloader.bin $(srcdir)/grub-core/tests/boot/pc-chainloader.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+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
+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_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 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
+
+if COND_mips_loongson
+BOOTCHECKS = bootcheck-linux-loongson
+endif
+
+if COND_mipsel
+if COND_mips_qemu_mips
+BOOTCHECKS = bootcheck-linux-mipsel
+endif
+endif
+if COND_mipseb
+if COND_mips_qemu_mips
+BOOTCHECKS = bootcheck-linux-mips
+endif
+endif
+
+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
+
+# Randomly generated
+SUCCESSFUL_BOOT_STRING=3e49994fd5d82b7c9298d672d774080d
+# tianocore cd access is very slow
+BOOTCHECK_TIMEOUT=180
+
+bootcheck: $(BOOTCHECKS)
+
+if COND_i386_coreboot
+default_payload.elf: grub-mkstandalone grub-mkimage
+	pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos xfs 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' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
+endif
+
+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
+
+windowszip=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows.zip
+windowszip: windowsdir
+	test -f $(windowszip) && rm $(windowszip) || true
+	zip -r $(windowszip) $(windowsdir)
+
+EXTRA_DIST += linguas.sh

Makefile.in

@@ -1,544 +0,0 @@
-# -*- makefile -*-
-#
-# Copyright (C) 1994,1995,1996,1997,1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
-#
-# This Makefile.in is free software; the author
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-### The configure script will replace these variables.
-
-SHELL = /bin/sh
-
-@SET_MAKE@
-
-transform = @program_transform_name@
-
-srcdir = @srcdir@
-builddir = @builddir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datarootdir = @datarootdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-pkgdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`
-pkglibdir =  $(libdir)/`echo @PACKAGE_TARNAME@/$(target_cpu)-$(platform) | sed '$(transform)'`
-
-# Internationalization library.
-LIBINTL = @LIBINTL@
-
-XGETTEXT = @XGETTEXT@
-MSGMERGE = @MSGMERGE@
-MSGFMT = @MSGFMT@
-
-LINGUAS = $(shell for i in $(srcdir)/po/*.po ; do \
-			if test -e $$i ; then echo $$i ; fi ; \
-		done | sed -e "s,.*/po/\(.*\)\.po$$,\1,")
-
-PACKAGE = @PACKAGE@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-
-host_os = @host_os@
-host_kernel = @host_kernel@
-host_cpu = @host_cpu@
-
-target_cpu = @target_cpu@
-platform = @platform@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-MKDIR_P = @MKDIR_P@
-
-mkinstalldirs = $(srcdir)/mkinstalldirs
-
-LIBS = @LIBS@ $(LIBINTL)
-
-CC = @CC@
-CFLAGS = @CFLAGS@
-ASFLAGS = @ASFLAGS@
-LDFLAGS = @LDFLAGS@ $(LIBS)
-CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
-	 -DGRUB_LIBDIR=\"$(pkglibdir)\" -DLOCALEDIR=\"$(localedir)\"
-TARGET_CC = @TARGET_CC@
-TARGET_CFLAGS = @TARGET_CFLAGS@
-TARGET_ASFLAGS = @TARGET_ASFLAGS@
-TARGET_MODULE_FORMAT = @TARGET_MODULE_FORMAT@
-TARGET_APPLE_CC = @TARGET_APPLE_CC@
-OBJCONV = @OBJCONV@
-TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -I$(srcdir)/include -I$(builddir) -I$(builddir)/include \
-	-Wall -W
-TARGET_LDFLAGS = @TARGET_LDFLAGS@
-TARGET_IMG_LDSCRIPT = @TARGET_IMG_LDSCRIPT@
-TARGET_IMG_LDFLAGS = @TARGET_IMG_LDFLAGS@
-TARGET_IMG_CFLAGS = @TARGET_IMG_CFLAGS@
-TARGET_OBJ2ELF = @TARGET_OBJ2ELF@
-EXEEXT = @EXEEXT@
-OBJCOPY = @OBJCOPY@
-STRIP = @STRIP@
-NM = @NM@
-RUBY = @RUBY@
-MAKEINFO = @MAKEINFO@
-ifeq (, $(MAKEINFO))
-MAKEINFO = true
-endif
-HELP2MAN = @HELP2MAN@
-ifeq (, $(HELP2MAN))
-HELP2MAN = true
-else
-HELP2MAN := LANG=C $(HELP2MAN) --no-info --source=FSF
-endif
-AWK = @AWK@
-LIBCURSES = @LIBCURSES@
-LIBUSB = @LIBUSB@
-LIBSDL = @LIBSDL@
-LIBPCIACCESS = @LIBPCIACCESS@
-YACC = @YACC@
-FONT_SOURCE = @FONT_SOURCE@
-
-# Options.
-enable_grub_emu_usb = @enable_grub_emu_usb@
-enable_grub_emu_sdl = @enable_grub_emu_sdl@
-enable_grub_emu_pci = @enable_grub_emu_pci@
-enable_grub_fstest = @enable_grub_fstest@
-enable_grub_pe2elf = @enable_grub_pe2elf@
-enable_grub_mkfont = @enable_grub_mkfont@
-freetype_cflags = @freetype_cflags@
-freetype_libs = @freetype_libs@
-enable_efiemu = @enable_efiemu@
-
-### General variables.
-
-RMKFILES = $(wildcard conf/*.rmk)
-
-MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
-
-PKGLIB = $(pkglib_IMAGES) $(pkglib_MODULES) $(pkglib_PROGRAMS) \
-	$(pkglib_DATA) $(pkglib_BUILDDIR)
-PKGDATA = $(pkgdata_DATA)
-PROGRAMS = $(bin_UTILITIES) $(sbin_UTILITIES)
-SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) $(grub-mkconfig_SCRIPTS) \
-	$(lib_SCRIPTS)
-INFOS = $(info_INFOS)
-
-CLEANFILES =
-MOSTLYCLEANFILES =
-DISTCLEANFILES = config.status config.cache config.log config.h \
-	Makefile stamp-h stamp-h1 include/grub/cpu include/grub/machine \
-	gensymlist.sh genkernsyms.sh build_env.mk \
-	docs/grub.info docs/version.texi docs/stamp-vti
-
-MAINTAINER_CLEANFILES = $(srcdir)/configure $(addprefix $(srcdir)/,$(MKFILES)) \
-	$(srcdir)/DISTLIST $(srcdir)/config.h.in $(srcdir)/stamp-h.in $(INFOS)
-
-# The default target.
-all: all-local
-
-### Include an arch-specific Makefile.
-$(addprefix $(srcdir)/,$(MKFILES)): %.mk: %.rmk genmk.rb
-	if test "x$(RUBY)" = x; then \
-	  touch $@; \
-	else \
-	  $(RUBY) $(srcdir)/genmk.rb < $< > $@; \
-	fi
-
-ifeq ($(platform), emu)
-include $(srcdir)/conf/any-emu.mk
-else
-include $(srcdir)/conf/$(target_cpu)-$(platform).mk
-# For tests.
-include $(srcdir)/conf/tests.mk
-# For external modules.
--include $(wildcard $(GRUB_CONTRIB)/*/conf/common.mk)
-endif
-
-### General targets.
-
-CLEANFILES += $(pkglib_DATA) $(pkgdata_DATA) po/*.mo
-pkglib_DATA += moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst
-moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep.awk
-	cat $(DEFSYMFILES) /dev/null \
-	  | $(AWK) -f $(srcdir)/genmoddep.awk $(UNDSYMFILES) > $@ \
-	  || (rm -f $@; exit 1)
-
-command.lst: $(COMMANDFILES)
-	cat $^ /dev/null | sort > $@
-
-fs.lst: $(FSFILES)
-	cat $^ /dev/null | sort > $@
-
-partmap.lst: $(PARTMAPFILES)
-	cat $^ /dev/null | sort > $@
-
-handler.lst: $(HANDLERFILES)
-	cat $^ /dev/null | sort > $@
-
-terminal.lst: $(TERMINALFILES)
-	cat $^ /dev/null | sort > $@
-
-parttool.lst: $(PARTTOOLFILES)
-	cat $^ /dev/null | sort | uniq > $@
-
-video.lst: $(VIDEOFILES)
-	cat $^ /dev/null | sort | uniq > $@
-
-crypto.lst: lib/libgcrypt-grub/cipher/crypto.lst
-	cp $^ $@
-
-ifneq (true, $(MAKEINFO))
-info_INFOS += docs/grub.info
-endif
-
-MOSTLYCLEANFILES += vti.tmp
-MAINTAINER_CLEANFILES += docs/stamp-vti docs/version.texi
-docs/version.texi: docs/stamp-vti
-docs/stamp-vti: docs/grub.texi configure.ac
-	$(MKDIR_P) docs
-	(set `$(SHELL) $(srcdir)/docs/mdate-sh $<`; \
-	echo "@set UPDATED $$1 $$2 $$3"; \
-	echo "@set UPDATED-MONTH $$2 $$3"; \
-	echo "@set EDITION $(PACKAGE_VERSION)"; \
-	echo "@set VERSION $(PACKAGE_VERSION)") > vti.tmp
-	@cmp -s vti.tmp $(builddir)/docs/version.texi \
-	  || (echo "Updating $(builddir)/docs/version.texi"; \
-	      cp vti.tmp $(builddir)/docs/version.texi)
-	-@rm -f vti.tmp
-	@cp $(builddir)/docs/version.texi $@
-
-# Use --force until such time as the documentation is cleaned up.
-docs/grub.info: docs/grub.texi docs/version.texi docs/fdl.texi
-	$(MKDIR_P) docs
-	-$(MAKEINFO) -P $(builddir)/docs --no-split --force $< -o $@
-
-ifeq (, $(FONT_SOURCE))
-else
-
-ifeq ($(enable_grub_mkfont),yes)
-
-pkgdata_DATA += unicode.pf2 ascii.pf2 ascii.h
-CLEANFILES += ascii.bitmaps
-
-# Arrows and lines are needed to draw the menu, so we always include them
-UNICODE_ARROWS=0x2190-0x2193
-UNICODE_LINES=0x2501-0x251B
-
-unicode.pf2: $(FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE)
-
-ascii.pf2: $(FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
-
-ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
-
-ascii.h: ascii.bitmaps grub-bin2h
-	$(builddir)/grub-bin2h ascii_bitmaps < $< > $@
-
-TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1
-endif
-endif
-
-# Used for building modules externally
-pkglib_BUILDDIR += build_env.mk
-build_env.mk: Makefile
-	(\
-	echo "TARGET_CC=$(TARGET_CC)" ; \
-	echo "TARGET_CFLAGS=$(TARGET_CFLAGS)" ; \
-	echo "TARGET_ASFLAGS=$(TARGET_ASFLAGS)" ; \
-	echo "TARGET_CPPFLAGS=$(TARGET_CPPFLAGS) -I$(pkglibdir) -I$(includedir)" ; \
-	echo "STRIP=$(STRIP)" ; \
-	echo "OBJCONV=$(OBJCONV)" ; \
-	echo "TARGET_MODULE_FORMAT=$(TARGET_MODULE_FORMAT)" ; \
-	echo "TARGET_APPLE_CC=$(TARGET_APPLE_CC)" ; \
-	echo "COMMON_ASFLAGS=$(COMMON_ASFLAGS)" ; \
-	echo "COMMON_CFLAGS=$(COMMON_CFLAGS)" ; \
-	echo "COMMON_LDFLAGS=$(COMMON_LDFLAGS)"\
-	) > $@
-pkglib_BUILDDIR += config.h grub_script.tab.h
-
-all-local: $(PROGRAMS) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(INFOS) $(MKFILES) $(foreach lang, $(LINGUAS), po/$(lang).mo)
-
-install: install-local
-
-install-local: all
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-	rm -f $(DESTDIR)$(pkglibdir)/*
-	@list='$(PKGLIB)'; \
-	for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkglibdir)/$$dest; \
-	done
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-	@list='$(PKGDATA)'; \
-	for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkgdatadir)/$$dest; \
-	done
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
-	@list='$(bin_UTILITIES)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-	  $(HELP2MAN) --section=1 -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
-	done
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
-	@list='$(sbin_UTILITIES)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-	  $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
-	done
-	@list='$(bin_SCRIPTS)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-	  $(HELP2MAN) --section=1 -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
-	done
-	@list='$(sbin_SCRIPTS)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-	  $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
-	done
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d
-	@list='$(grub-mkconfig_SCRIPTS)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
-	done
-	@list='$(grub-mkconfig_DATA)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
-	done
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(libdir)/grub
-	@list='$(lib_SCRIPTS)'; \
-	for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/grub/$$dest; \
-	done
-	@langs='$(LINGUAS)'; \
-	for lang in $$langs; do \
-	  $(SHELL) $(mkinstalldirs) $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES; \
-	  file="po/$$lang.mo"; \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
-	done
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(infodir)
-	@list='$(info_INFOS)'; \
-	for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(infodir); \
-	  if (install-info --version && \
-	       install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$dest" || :; \
-	  fi; \
-	done
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" install
-
-uninstall:
-	@list='$(PKGLIB)'; \
-	for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  rm -f $(DESTDIR)$(pkglibdir)/$$dest; \
-	done
-	@list='$(PKGDATA)'; \
-	for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  rm -f $(DESTDIR)$(pkgdatadir)/$$dest; \
-	done
-	@list='$(bin_UTILITIES) $(bin_SCRIPTS)'; for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  rm -f $(DESTDIR)$(bindir)/$$dest; \
-	  rm -f $(DESTDIR)$(mandir)/man1/$$dest.1; \
-	done
-	@list='$(sbin_UTILITIES) $(sbin_SCRIPTS)'; for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  rm -f $(DESTDIR)$(sbindir)/$$dest; \
-	  rm -f $(DESTDIR)$(mandir)/man8/$$dest.8; \
-	done
-	@list='$(grub-mkconfig_SCRIPTS) $(grub-mkconfig_DATA)'; for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  rm -f $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
-	done
-	@list='$(lib_SCRIPTS)'; \
-	for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  echo rm -f $(DESTDIR)$(libdir)/$$dest; \
-	  rm -f $(DESTDIR)$(libdir)/grub/$$dest; \
-	done
-	@list='$(info_INFOS)'; \
-	for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  if (install-info --version && \
-	       install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-	    if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$dest"; then \
-	      :; \
-	    else \
-	      test ! -f "$(DESTDIR)$(infodir)/$$dest" || exit 1; \
-	    fi; \
-	  fi; \
-	  rm -f $(DESTDIR)$(infodir)/$$dest; \
-	done
-
-clean: $(CLEAN_IMAGE_TARGETS) $(CLEAN_MODULE_TARGETS) $(CLEAN_UTILITY_TARGETS)
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-mostlyclean: clean $(MOSTLYCLEAN_IMAGE_TARGETS) $(MOSTLYCLEAN_MODULE_TARGETS) $(MOSTLYCLEAN_UTILITY_TARGETS)
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-distclean: mostlyclean
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-	-rm -rf $(srcdir)/autom4te.cache
-
-maintainer-clean: distclean
-	-test -z "$(MAINTAINER_CLEANFILES)" || rm -f $(MAINTAINER_CLEANFILES)
-
-info:
-
-dvi:
-
-distdir=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-
-DISTLIST: gendistlist.sh
-	$(SHELL) $(srcdir)/gendistlist.sh > $(srcdir)/DISTLIST
-
-distdir: DISTLIST
-	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
-	$(SHELL) $(mkinstalldirs) $(distdir)
-	for i in `cat $(srcdir)/DISTLIST`; do \
-	  dir=`echo "$$i" | sed 's:/[^/]*$$::'`; \
-	  if test -d $(srcdir)/$$dir; then \
-	    $(SHELL) $(mkinstalldirs) $(distdir)/$$dir; \
-	  fi; \
-	  cp -p $(srcdir)/$$i $(distdir)/$$i || exit 1; \
-	done
-	chmod -R a+r $(distdir)
-
-GZIP_ENV = --best
-
-dist: distdir
-	tar chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
-
-distcheck: dist
-	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) gzip -cd $(distdir).tar.gz | tar xf -
-	chmod -R a-w $(distdir)
-	chmod a+w $(distdir)
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	chmod a-w $(distdir)
-	dc_instdir=`CDPATH=: && cd $(distdir)/=inst && pwd` \
-	  && cd $(distdir)/=build \
-	  && $(SHELL) ../configure --srcdir=.. --prefix=$$dc_instdir \
-	  && $(MAKE) all dvi check install && $(MAKE) uninstall \
-	  && (test `find $$dc_instdir -type f -print | wc -l` -le 1 \
-	     || (echo "Error: files left after uninstall" 1>&2; \
-	         exit 1)) \
-	  && $(MAKE) dist && $(MAKE) distclean \
-	  && rm -f $(distdir).tar.gz \
-	  && (test `find . -type f -print | wc -l` -eq 0 \
-	     || (echo "Error: files left after distclean" 1>&2; \
-	         exit 1))
-	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
-	@echo "$(distdir).tar.gz is ready for distribution" | \
-	  sed 'h;s/./=/g;p;x;p;x'
-
-check: all $(UNIT_TESTS) $(FUNCTIONAL_TESTS) $(SCRIPTED_TESTS)
-	@list="$(UNIT_TESTS)"; \
-	set -e; \
-	for file in $$list; do \
-	  $(builddir)/$$file; \
-	done
-	@list="$(FUNCTIONAL_TESTS)"; \
-	set -e; \
-	for file in $$list; do \
-	  mod=`basename $$file .mod`; \
-	  echo "insmod functional_test; insmod $$mod; functional_test" \
-	    | $(builddir)/grub-shell; \
-	done
-	@list="$(SCRIPTED_TESTS)"; \
-	set -e; \
-	for file in $$list; do \
-	  $(builddir)/$$file; \
-	done
-
-.SUFFIX:
-.SUFFIX: .c .o .S .d
-
-# Regenerate configure and Makefile automatically.
-$(srcdir)/aclocal.m4: configure.ac acinclude.m4
-	cd $(srcdir) && aclocal
-
-$(srcdir)/configure: configure.ac aclocal.m4
-	cd $(srcdir) && autoconf
-
-$(srcdir)/config.h.in: stamp-h.in
-$(srcdir)/stamp-h.in: configure.ac aclocal.m4
-	cd $(srcdir) && autoheader
-	echo timestamp > $(srcdir)/stamp-h.in
-
-config.h: stamp-h
-stamp-h: config.h.in config.status
-	$(SHELL) ./config.status
-
-Makefile: Makefile.in config.status
-	$(SHELL) ./config.status
-
-config.status: configure
-	$(SHELL) ./config.status --recheck
-
-gensymlist.sh: gensymlist.sh.in config.status
-	$(SHELL) ./config.status
-
-genkernsyms.sh: genkernsyms.sh.in config.status
-	$(SHELL) ./config.status
-
-$(srcdir)/po/$(PACKAGE).pot: po/POTFILES po/POTFILES-shell
-	cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o $@ -f $< --keyword=_ --keyword=N_
-	cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o $@ -f po/POTFILES-shell -j --language=Shell
-
-$(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): po/$(PACKAGE).pot
-	$(MSGMERGE) -U $@ $^
-
-po/%.mo: po/%.po
-	$(MKDIR_P) $$(dirname $@)
-	$(MSGFMT) -c --statistics -o $@ $^
-
-.PHONY: all install install-strip uninstall clean mostlyclean distclean
-.PHONY: maintainer-clean info dvi dist check
-
-# Prevent an overflow.
-.NOEXPORT:
-
-.DELETE_ON_ERROR:

NEWS

@@ -1,3 +1,262 @@
+New in 2.00:
+
+* Appearance:
+  * Official theme for gfxmenu (starfield)
+  * Menu is organised with submenus.
+  * Better default video mode selection using EDID.
+
+* New platforms:
+  * Itanium port.
+  * Fuloong2F support (including GRUB as firmware)
+  * Fuloong2E support (except GRUB as firmware)
+  * ARCS (SGI machines) port.
+  * qemu -M mips port.
+
+* grub-mount to mount filesystems using GRUB FS drivers and FUSE.
+
+* Changed security default so entries are locked by default if any superuser is
+  defined. 
+
+* New drivers:
+  * EHCI.
+  * AHCI.
+  * ESCC serial.
+  * 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.
+  * Plan9 partition map.
+  * Big-endian mdraid.
+  * Big-endian cpio.
+  * ODC and NEWC cpio.
+  * ExFAT.
+  * Minix3fs.
+  * Big-endian minixfs.
+  * RomFS.
+  * Squash4.
+  * Support non-512B disk blocks.
+  * LUKS and GELI support.
+  * LDM read support (no install yet).
+  * LZOP.
+
+* Improved filesystem and disks formats support:
+  * HFS+ label support.
+  * Improved reiserfs support.
+  * multidevice, mirrored and raidz(2,3) ZFS support.
+  * RAID LVM (internal RAIDing) support.
+  * ZFS crypto 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.
+  * Improved AFFS and SFS support.
+  * LZO-compressed btrfs support.
+  * cpio and tar symlinks support.
+  * Better FS detection to reduce false positives.
+
+* New boot protocols:
+  * Ability to load another coreboot payload when on coreboot.
+  * Plan9.
+  * Freedos.
+  * Ntldr/bootmgr (to load Windows bootloader).
+  * chainloader --bpb support to patch FAT or NTFS BPB in memory to correct
+    wrong partition offset.
+  * PXE chainloading support.
+  * Darwin 11 (Mac OS X Lion) protocol support.
+
+* Boot protocol improvements:
+  * Multiple initrd support.
+  * Basic illumos and xnu autoconfig.
+
+* Testing and debugging:
+  * New grub-fstest commands: cat, zfsinfo, testload xnu_uuid
+  * grub-fstest recursive directory compare for quickly checking that
+    a directory is read correctly.
+  * Backtace on crash (if gdb module is loaded, x86 only)
+  * Disk cache statistics gathering.
+  * GDB stub and GDB support script.
+  * "make check" and "make bootcheck" expanded to almost all platforms
+    (except i386-ieee1275, mips-arc, sparc64-ieee1275, ia64-efi and emu)
+  * New `time' command.
+
+* Performance:
+  * Lazy scanning to avoid accessing devices which aren't really used.
+    This avoids boot delay due to slow device scanning.
+  * Use CPU cache when accessing video memory.
+  * Search hints to first try the most likely device when searching for a
+    device with given UUID. This avoids slow scanning in most cases.
+
+* Internationalisation:
+  * Updated to Unicode 6.0.
+  * $"..." syntax for translation in grub scripting language. This allows easy
+    translation of grub.cfg at runtime.
+  * Translations to many languages included in official distribution.
+
+* Scripting:
+  * $grub_cpu and $grub_platform variables for conditioning grub.cfg on platform
+    at runtime.
+  * $feature_* variables to condition scripts on available features.
+  * Use of ids to identify menu entries.
+  * all_video module which is empty but depends on all video modules thus
+    allowing easy loading of all of them.
+
+* Installation:
+  * grub-mknetdir script for easy creation of netbootable GRUB directory.
+  * Itanium and mips support in grub-mkrescue.
+  * grub-install support for all platforms except emu.
+  * PreP partition install support.
+  * No files conflict between flavours (except grub-mkrescue for ppc). This
+    allows easy install of GRUB for several platforms.
+  * grub-mkstandalone script for easy creating of image including all modules
+    for platforms with generous limit on image size.
+  * program-transform-name now functions according to usual conventions.
+    Use --grubdir and --bootdir to get old behaviour.
+
+* ADLER32 and CRC64 support (for XZ and hashsum).
+
+* ofconsole renamed to console
+
+* Experimental support for compiling with Apple toolchain.
+
+* grub-mkdevicemap removed. Now all devices are detected on invocation of
+  any grub utility.
+
+New in 1.99:
+
+* Keyboard layouts support.
+
+* New `lsapm' command (i386-pc only).
+
+* Parser for GRUB Legacy configuration files.
+
+* Support RAID on virtio devices.
+
+* Remove deprecated `root' command.
+
+* New `euro.pf2' font which supports most European languages.
+
+* Avoid opening the same device twice on Open Firmware platforms.
+
+* Extend `vbeinfo' and `vbetest' commands to non-VBE graphics, as
+  `videoinfo' and `videotest'.
+
+* New `lsefisystab', `lssal', and `lsefimmap' commands on EFI platforms.
+
+* Support explicit user claim that a device is BIOS-visible.  Devices
+  listed in device.map will be assumed to be readable using only BIOS
+  facilities, rather than anything more complex such as LVM or RAID.
+
+* New bash-completion script for GRUB utilities.
+
+* Use ACPI to shut down if possible.
+
+* New `lsacpi' command.
+
+* Btrfs support.
+
+* New `--boot-directory' option to `grub-install', `grub-reboot', and
+  `grub-set-default', with clearer semantics than the previous
+  `--root-directory' option.
+
+* Rename CD-ROM device to "cd" on BIOS platforms.
+
+* Transparent decompression filters.
+
+* Simpler PXE image generation.  New `grub-mknetdir' utility to generate
+  netboot directory trees.
+
+* New relocator.  Allows for more kernel support and more
+  straightforward loader writing.
+
+* Handle USB pendrives exposed as floppies.
+
+* New Automake-based build system.
+
+* Add `sendkey' command (i386-pc only).
+
+* ZFS support.
+
+* Support 1.x versions of mdadm metadata.
+
+* Fix corruption when reading Reiserfs directory entries.
+
+* Bidirectional text and diacritics support.
+
+* Skip LVM snapshots.
+
+* MIPS Yeeloong firmware port.
+
+* Change grub-mkdevicemap to emit /dev/disk/by-id/ names where possible
+  on GNU/Linux.
+
+* Add `grub-mkconfig' support for Xen with Linux.
+
+* Add `grub-mkconfig' support for initrd images on Fedora 13.
+
+* Support >3GiB and <16MiB RAM in i386-qemu.
+
+* Add support for Cirrus 5446 and Bochs video cards.
+
+* Load more appropriate video drivers automatically in `grub-mkconfig'.
+
+* USB improvements, including hotplugging/hotunplugging, hub support,
+  and USB serial support.
+
+* AMD Geode CS5536 support.
+
+* Extensive updates to the Texinfo documentation.
+
+* Handle symbolic links under /dev/mapper on GNU/Linux.
+
+* Handle installation across multiple partition table types.
+
+* Add `cmostest' command (i386/x86_64 only).
+
+* Add support for DM-RAID disk devices on GNU/Linux.
+
+* Remove `grub-mkisofs'.  `grub-mkrescue' now uses GNU xorriso to build
+  CD images.
+
+* `grub-mkrescue' support for EFI, coreboot, and QEMU platforms.
+
+* Unify `grub-mkimage', `grub-setup', and `grub-install' source code
+  across platforms.
+
+* Fix VGA (as opposed to VBE) video driver, formerly a terminal driver.
+
+* Add menu hotkey support.
+
+* Add support for the nilfs2 filesystem.
+
+* `grub-probe' and `grub-mkconfig' support for NetBSD.
+
+* Support setting a background image in `grub-mkconfig'.
+
+* Support multiple terminals in `grub-mkconfig'.
+
+* Regexp support.
+
+* MIPS multiboot2 support.
+
+* Multiboot2 tag support.
+
+* sunpc partition table support.
+
+* Add a number of new language features to GRUB script: `for', `while',
+  `until', `elif', function parameters, `break', `continue', `shift',
+  multi-line quoted strings, positional parameters with `setparams',
+  `return', filename wildcard expansion, and `!'.
+
+* Support nested partition tables.  GRUB now prefers to name partitions
+  in the form `(hd0,msdos1,bsd1)' rather than `(hd0,1,a)'.
+
+* Speed up consecutive hostdisk operations on the same device.
+
+* Compile parts of `grub-emu' as modules.
+
 New in 1.98 - 2010-03-06:
 
 * Multiboot on EFI support.

README

@@ -10,5 +10,13 @@ GRUB 2 data and program files.
 Please visit the official web page of GRUB 2, for more information.
 The URL is <http://www.gnu.org/software/grub/grub.html>.
 
-For now, there is not much documentation yet. Please look at the GRUB
-Wiki <http://grub.enbug.org> for testing procedures.
+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
+see:
+
+  info grub Introduction 'Changes from GRUB Legacy'

acinclude.m4

@@ -38,6 +38,7 @@ dnl Written by Pavel Roskin. Based on grub_ASM_EXT_C written by
 dnl Erich Boleyn and modified by Yoshinori K. Okuji.
 AC_DEFUN([grub_ASM_USCORE],
 [AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_EGREP])
 AC_MSG_CHECKING([if C symbols get an underscore after compilation])
 AC_CACHE_VAL(grub_cv_asm_uscore,
 [cat > conftest.c <<\EOF
@@ -56,19 +57,16 @@ else
   AC_MSG_ERROR([${CC-cc} failed to produce assembly code])
 fi
 
-if grep _func conftest.s >/dev/null 2>&1; then
+if $EGREP '(^|[^_[:alnum]])_func' conftest.s >/dev/null 2>&1; then
+  HAVE_ASM_USCORE=1
   grub_cv_asm_uscore=yes
 else
+  HAVE_ASM_USCORE=0
   grub_cv_asm_uscore=no
 fi
 
 rm -f conftest*])
 
-if test "x$grub_cv_asm_uscore" = xyes; then
-  AC_DEFINE_UNQUOTED([HAVE_ASM_USCORE], $grub_cv_asm_uscore,
-    [Define if C symbols get an underscore after compilation])
-fi
-
 AC_MSG_RESULT([$grub_cv_asm_uscore])
 ])
 
@@ -76,7 +74,7 @@ AC_MSG_RESULT([$grub_cv_asm_uscore])
 dnl Some versions of `objcopy -O binary' vary their output depending
 dnl on the link address.
 AC_DEFUN([grub_PROG_OBJCOPY_ABSOLUTE],
-[AC_MSG_CHECKING([whether ${OBJCOPY} works for absolute addresses])
+[AC_MSG_CHECKING([whether ${TARGET_OBJCOPY} works for absolute addresses])
 AC_CACHE_VAL(grub_cv_prog_objcopy_absolute,
 [cat > conftest.c <<\EOF
 void cmain (void);
@@ -93,13 +91,13 @@ else
 fi
 grub_cv_prog_objcopy_absolute=yes
 for link_addr in 0x2000 0x8000 0x7C00; do
-  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC} -Wl,-Ttext -Wl,$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
-  if AC_TRY_COMMAND([${OBJCOPY-objcopy} --only-section=.text -O binary conftest.exec conftest]); then :
+  if AC_TRY_COMMAND([${TARGET_OBJCOPY-objcopy} --only-section=.text -O binary conftest.exec conftest]); then :
   else
-    AC_MSG_ERROR([${OBJCOPY-objcopy} cannot create binary files])
+    AC_MSG_ERROR([${TARGET_OBJCOPY-objcopy} cannot create binary files])
   fi
   if test ! -f conftest.old || AC_TRY_COMMAND([cmp -s conftest.old conftest]); then
     mv -f conftest conftest.old
@@ -136,6 +134,79 @@ 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])
+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"
+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])
+
+if test "x$grub_cv_prog_nm_minus_p" = xyes; then
+  TARGET_NMFLAGS_MINUS_P="-P"
+else
+  TARGET_NMFLAGS_MINUS_P=
+fi
+])
+
+dnl Supply --defined-only to nm
+AC_DEFUN([grub_PROG_NM_DEFINED_ONLY],
+[AC_MSG_CHECKING([whether nm accepts --defined-only])
+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"
+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])
+
+if test "x$grub_cv_prog_nm_defined_only" = xyes; then
+  TARGET_NMFLAGS_DEFINED_ONLY=--defined-only
+else
+  TARGET_NMFLAGS_DEFINED_ONLY=
+fi
+])
+
 
 dnl Mass confusion!
 dnl Older versions of GAS interpret `.code16' to mean ``generate 32-bit
@@ -166,7 +237,7 @@ 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
+if AC_TRY_COMMAND([${CC-cc} ${TARGET_CCASFLAGS} ${CFLAGS} -c conftest.s]) && test -s conftest.o; then
   grub_cv_i386_asm_addr32=yes
 else
   grub_cv_i386_asm_addr32=no
@@ -176,37 +247,6 @@ 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.
@@ -220,7 +260,7 @@ AC_CACHE_VAL(grub_cv_i386_asm_prefix_requirement,
 l1:	addr32	movb	%al, l1
 EOF
 
-if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -c conftest.s]) && test -s conftest.o; then
+if AC_TRY_COMMAND([${CC-cc} ${TARGET_CCASFLAGS} ${CFLAGS} -c conftest.s]) && test -s conftest.o; then
   grub_cv_i386_asm_prefix_requirement=yes
 else
   grub_cv_i386_asm_prefix_requirement=no
@@ -236,44 +276,12 @@ else
   grub_tmp_data32="data32;"
 fi
 
-AC_DEFINE_UNQUOTED([ADDR32], $grub_tmp_addr32,
-  [Define it to \"addr32\" or \"addr32;\" to make GAS happy])
-AC_DEFINE_UNQUOTED([DATA32], $grub_tmp_data32,
-  [Define it to \"data32\" or \"data32;\" to make GAS happy])
+ADDR32=$grub_tmp_addr32
+DATA32=$grub_tmp_data32
 
 AC_MSG_RESULT([$grub_cv_i386_asm_prefix_requirement])])
 
 
-dnl Older versions of GAS require that absolute indirect calls/jumps are
-dnl not prefixed with `*', while later versions warn if not prefixed.
-AC_DEFUN([grub_I386_ASM_ABSOLUTE_WITHOUT_ASTERISK],
-[AC_REQUIRE([AC_PROG_CC])
-AC_MSG_CHECKING(dnl
-[whether an absolute indirect call/jump must not be prefixed with an asterisk])
-AC_CACHE_VAL(grub_cv_i386_asm_absolute_without_asterisk,
-[cat > conftest.s <<\EOF
-	lcall	*(offset)
-offset:
-	.long	0
-	.word	0
-EOF
-
-if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -c conftest.s]) && test -s conftest.o; then
-  grub_cv_i386_asm_absolute_without_asterisk=no
-else
-  grub_cv_i386_asm_absolute_without_asterisk=yes
-fi
-
-rm -f conftest*])
-
-if test "x$grub_cv_i386_asm_absolute_without_asterisk" = xyes; then
-  AC_DEFINE([ABSOLUTE_WITHOUT_ASTERISK], 1,
-	    [Define it if GAS requires that absolute indirect calls/jumps are not prefixed with an asterisk])
-fi
-
-AC_MSG_RESULT([$grub_cv_i386_asm_absolute_without_asterisk])])
-
-
 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],
@@ -305,14 +313,12 @@ AC_CACHE_VAL(grub_cv_check_uscore_edata_symbol,
 
 AC_MSG_RESULT([$grub_cv_check_uscore_edata_symbol])
 
-AH_TEMPLATE([BSS_START_SYMBOL], [Define it to one of __bss_start, edata and _edata])
-
 if test "x$grub_cv_check_uscore_uscore_bss_start_symbol" = xyes; then
-  AC_DEFINE([BSS_START_SYMBOL], [__bss_start])
+  BSS_START_SYMBOL=__bss_start
 elif test "x$grub_cv_check_edata_symbol" = xyes; then
-  AC_DEFINE([BSS_START_SYMBOL], [edata])
+  BSS_START_SYMBOL=edata
 elif test "x$grub_cv_check_uscore_edata_symbol" = xyes; then
-  AC_DEFINE([BSS_START_SYMBOL], [_edata])
+  BSS_START_SYMBOL=_edata
 else
   AC_MSG_ERROR([none of __bss_start, edata or _edata is defined])
 fi
@@ -340,43 +346,15 @@ AC_CACHE_VAL(grub_cv_check_uscore_end_symbol,
 
 AC_MSG_RESULT([$grub_cv_check_uscore_end_symbol])
 
-AH_TEMPLATE([END_SYMBOL], [Define it to either end or _end])
-
 if test "x$grub_cv_check_end_symbol" = xyes; then
-  AC_DEFINE([END_SYMBOL], [end])
+  END_SYMBOL=end
 elif test "x$grub_cv_check_uscore_end_symbol" = xyes; then
-  AC_DEFINE([END_SYMBOL], [_end])
+  END_SYMBOL=_end
 else
   AC_MSG_ERROR([neither end nor _end is defined])
 fi
 ])
 
-dnl Check if the C compiler generates calls to `__enable_execute_stack()'.
-AC_DEFUN([grub_CHECK_ENABLE_EXECUTE_STACK],[
-AC_MSG_CHECKING([whether `$CC' generates calls to `__enable_execute_stack()'])
-AC_LANG_CONFTEST([[
-void f (int (*p) (void));
-void g (int i)
-{
-  int nestedfunc (void) { return i; }
-  f (nestedfunc);
-}
-]])
-if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -S conftest.c]) && test -s conftest.s; then
-  true
-else
-  AC_MSG_ERROR([${CC-cc} failed to produce assembly code])
-fi
-if grep __enable_execute_stack conftest.s >/dev/null 2>&1; then
-  AC_DEFINE([NEED_ENABLE_EXECUTE_STACK], 1,
-	    [Define to 1 if GCC generates calls to __enable_execute_stack()])
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
-rm -f conftest*
-])
-
 
 dnl Check if the C compiler supports `-fstack-protector'.
 AC_DEFUN([grub_CHECK_STACK_PROTECTOR],[
@@ -384,7 +362,9 @@ AC_DEFUN([grub_CHECK_STACK_PROTECTOR],[
 ssp_possible=yes]
 AC_MSG_CHECKING([whether `$CC' accepts `-fstack-protector'])
 # Is this a reliable test case?
-AC_LANG_CONFTEST([[void foo (void) { volatile char a[8]; a[3]; }]])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[
+void foo (void) { volatile char a[8]; a[3]; }
+]])])
 [# `$CC -c -o ...' might not be portable.  But, oh, well...  Is calling
 # `ac_compile' like this correct, after all?
 if eval "$ac_compile -S -fstack-protector -o conftest.s" 2> /dev/null; then]
@@ -402,8 +382,10 @@ AC_DEFUN([grub_CHECK_STACK_ARG_PROBE],[
 [# Smashing stack arg probe.
 sap_possible=yes]
 AC_MSG_CHECKING([whether `$CC' accepts `-mstack-arg-probe'])
-AC_LANG_CONFTEST([[void foo (void) { volatile char a[8]; a[3]; }]])
-[if eval "$ac_compile -S -mstack-arg-probe -o conftest.s" 2> /dev/null; then]
+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]
   AC_MSG_RESULT([yes])
   [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'?
   rm -f conftest.s
@@ -437,7 +419,7 @@ AC_DEFUN([grub_CHECK_PIE],[
 pie_possible=yes]
 AC_MSG_CHECKING([whether `$CC' has `-fPIE' as default])
 # Is this a reliable test case?
-AC_LANG_CONFTEST([[
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[
 #ifdef __PIE__
 int main() {
 	return 0;
@@ -445,7 +427,7 @@ int main() {
 #else
 #error NO __PIE__ DEFINED
 #endif
-]])
+]])])
 
 [# `$CC -c -o ...' might not be portable.  But, oh, well...  Is calling
 # `ac_compile' like this correct, after all?
@@ -458,3 +440,57 @@ else
   AC_MSG_RESULT([no])
 [fi]
 ])
+
+dnl Check if the C compiler supports `-fPIC'.
+AC_DEFUN([grub_CHECK_PIC],[
+[# Position independent executable.
+pic_possible=yes]
+AC_MSG_CHECKING([whether `$CC' has `-fPIC' as default])
+# Is this a reliable test case?
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[
+#ifdef __PIC__
+int main() {
+	return 0;
+}
+#else
+#error NO __PIC__ DEFINED
+#endif
+]])])
+
+[# `$CC -c -o ...' might not be portable.  But, oh, well...  Is calling
+# `ac_compile' like this correct, after all?
+if eval "$ac_compile -S -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
+else
+  pic_possible=no]
+  AC_MSG_RESULT([no])
+[fi]
+])
+
+dnl Create an output variable with the transformed name of a GRUB utility
+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]
+])

autogen.sh

@@ -1,23 +1,89 @@
-#! /bin/sh
+#! /usr/bin/env bash
 
 set -e
 
-aclocal
-autoconf
-autoheader
+export LC_COLLATE=C
+unset LC_ALL
 
-# FIXME: automake doesn't like that there's no Makefile.am
-automake -a -c -f || true
+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 util -iname '*.in' ! -name Makefile.in  |sort > po/POTFILES-shell.in
 
-echo timestamp > stamp-h.in
+autogen --version >/dev/null || exit 1
 
-python util/import_gcry.py lib/libgcrypt/ .
+echo "Importing unicode..."
+python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt grub-core/unidata.c
 
-for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
-  if test -e $rmk ; then
-    ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`
+echo "Importing libgcrypt..."
+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
+fi
+if [ -d grub-core/lib/libgcrypt-grub/mpi/generic ]; then 
+    rm -rf grub-core/lib/libgcrypt-grub/mpi/generic
+fi
+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
+    ln -s generic/"$x" grub-core/lib/libgcrypt-grub/mpi/"$x"
+done
+
+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
+if [ "x${GRUB_CONTRIB}" != x ]; then
+  [ "${GRUB_CONTRIB}" = contrib ] || ln -s "${GRUB_CONTRIB}" contrib
+  [ "${GRUB_CONTRIB}" = grub-core/contrib ] || ln -s ../contrib grub-core/contrib
+fi
+
+UTIL_DEFS='Makefile.util.def Makefile.utilgcry.def'
+CORE_DEFS='grub-core/Makefile.core.def grub-core/Makefile.gcry.def'
+
+for extra in contrib/*/Makefile.util.def; do
+  if test -e "$extra"; then
+    UTIL_DEFS="$UTIL_DEFS $extra"
   fi
 done
-sh gendistlist.sh > DISTLIST
 
+for extra in contrib/*/Makefile.core.def; do
+  if test -e "$extra"; then
+    CORE_DEFS="$CORE_DEFS $extra"
+  fi
+done
+
+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
+    echo "include $extra" >> Makefile.util.am
+    echo "include $extra" >> grub-core/Makefile.core.am
+  fi
+done
+
+for extra in contrib/*/Makefile.util.common; do
+  if test -e "$extra"; then
+    echo "include $extra" >> Makefile.util.am
+  fi
+done
+
+for extra in contrib/*/Makefile.core.common; do
+  if test -e "$extra"; then
+    echo "include $extra" >> grub-core/Makefile.core.am
+  fi
+done
+
+echo "Saving timestamps..."
+echo timestamp > stamp-h.in
+
+echo "Running autoreconf..."
+autoreconf -vi
 exit 0

build-aux/config.rpath

@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2008 Free Software Foundation, Inc.
+#   Copyright 1996-2013 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -25,7 +25,7 @@
 #   known workaround is to choose shorter directory names for the build
 #   directory and/or the installation directory.
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 shrext=.so
@@ -57,13 +57,6 @@ else
     aix*)
       wl='-Wl,'
       ;;
-    darwin*)
-      case $cc_basename in
-        xlc*)
-          wl='-Wl,'
-          ;;
-      esac
-      ;;
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       ;;
     hpux9* | hpux10* | hpux11*)
@@ -72,9 +65,7 @@ else
     irix5* | irix6* | nonstopux*)
       wl='-Wl,'
       ;;
-    newsos6)
-      ;;
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
         ecc*)
           wl='-Wl,'
@@ -85,17 +76,26 @@ else
         lf95*)
           wl='-Wl,'
           ;;
-        pgcc | pgf77 | pgf90)
+        nagfor*)
+          wl='-Wl,-Wl,,'
+          ;;
+        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
           wl='-Wl,'
           ;;
         ccc*)
           wl='-Wl,'
           ;;
+        xl* | bgxl* | bgf* | mpixl*)
+          wl='-Wl,'
+          ;;
         como)
           wl='-lopt='
           ;;
         *)
           case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ F* | *Sun*Fortran*)
+              wl=
+              ;;
             *Sun\ C*)
               wl='-Wl,'
               ;;
@@ -103,13 +103,24 @@ else
           ;;
       esac
       ;;
+    newsos6)
+      ;;
+    *nto* | *qnx*)
+      ;;
     osf3* | osf4* | osf5*)
       wl='-Wl,'
       ;;
     rdos*)
       ;;
     solaris*)
-      wl='-Wl,'
+      case $cc_basename in
+        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+          wl='-Qoption ld '
+          ;;
+        *)
+          wl='-Wl,'
+          ;;
+      esac
       ;;
     sunos4*)
       wl='-Qoption ld '
@@ -171,15 +182,14 @@ if test "$with_gnu_ld" = yes; then
       fi
       ;;
     amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we cannot use
-      # them.
-      ld_shlibs=no
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
       ;;
     beos*)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -198,11 +208,13 @@ if test "$with_gnu_ld" = yes; then
         ld_shlibs=no
       fi
       ;;
+    haiku*)
+      ;;
     interix[3-9]*)
       hardcode_direct=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
       ;;
-    gnu* | linux* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
@@ -325,10 +337,14 @@ else
       fi
       ;;
     amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
       ;;
     bsdi[45]*)
       ;;
@@ -342,24 +358,15 @@ else
       ;;
     darwin* | rhapsody*)
       hardcode_direct=no
-      if test "$GCC" = yes ; then
+      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
         :
       else
-        case $cc_basename in
-          xlc*)
-            ;;
-          *)
-            ld_shlibs=no
-            ;;
-        esac
+        ld_shlibs=no
       fi
       ;;
     dgux*)
       hardcode_libdir_flag_spec='-L$libdir'
       ;;
-    freebsd1*)
-      ld_shlibs=no
-      ;;
     freebsd2.2*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -420,6 +427,8 @@ else
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       hardcode_libdir_separator=:
       ;;
+    *nto* | *qnx*)
+      ;;
     openbsd*)
       if test -f /usr/libexec/ld.so; then
         hardcode_direct=yes
@@ -515,7 +524,12 @@ case "$host_os" in
     library_names_spec='$libname$shrext'
     ;;
   amigaos*)
-    library_names_spec='$libname.a'
+    case "$host_cpu" in
+      powerpc*)
+        library_names_spec='$libname$shrext' ;;
+      m68k)
+        library_names_spec='$libname.a' ;;
+    esac
     ;;
   beos*)
     library_names_spec='$libname$shrext'
@@ -534,8 +548,6 @@ case "$host_os" in
   dgux*)
     library_names_spec='$libname$shrext'
     ;;
-  freebsd1*)
-    ;;
   freebsd* | dragonfly*)
     case "$host_os" in
       freebsd[123]*)
@@ -547,6 +559,9 @@ case "$host_os" in
   gnu*)
     library_names_spec='$libname$shrext'
     ;;
+  haiku*)
+    library_names_spec='$libname$shrext'
+    ;;
   hpux9* | hpux10* | hpux11*)
     case $host_cpu in
       ia64*)
@@ -582,7 +597,7 @@ case "$host_os" in
     ;;
   linux*oldld* | linux*aout* | linux*coff*)
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | k*bsd*-gnu | kopensolaris*-gnu)
     library_names_spec='$libname$shrext'
     ;;
   knetbsd*-gnu)
@@ -594,7 +609,7 @@ case "$host_os" in
   newsos6)
     library_names_spec='$libname$shrext'
     ;;
-  nto-qnx*)
+  *nto* | *qnx*)
     library_names_spec='$libname$shrext'
     ;;
   openbsd*)
@@ -625,6 +640,9 @@ case "$host_os" in
   sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
     library_names_spec='$libname$shrext'
     ;;
+  tpf*)
+    library_names_spec='$libname$shrext'
+    ;;
   uts4*)
     library_names_spec='$libname$shrext'
     ;;

build-aux/snippet/_Noreturn.h

@@ -0,0 +1,10 @@
+#if !defined _Noreturn && __STDC_VERSION__ < 201112
+# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
+      || 0x5110 <= __SUNPRO_C)
+#  define _Noreturn __attribute__ ((__noreturn__))
+# elif 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn
+# endif
+#endif

build-aux/snippet/arg-nonnull.h

@@ -0,0 +1,26 @@
+/* A C macro for declaring that specific arguments must not be NULL.
+   Copyright (C) 2009-2013 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/>.  */
+
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif

build-aux/snippet/c++defs.h

@@ -0,0 +1,271 @@
+/* C++ compatible function declaration macros.
+   Copyright (C) 2010-2013 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/>.  */
+
+#ifndef _GL_CXXDEFS_H
+#define _GL_CXXDEFS_H
+
+/* The three most frequent use cases of these macros are:
+
+   * For providing a substitute for a function that is missing on some
+     platforms, but is declared and works fine on the platforms on which
+     it exists:
+
+       #if @GNULIB_FOO@
+       # if !@HAVE_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       # endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on all platforms,
+     but is broken/insufficient and needs to be replaced on some platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on some platforms
+     but is broken/insufficient and needs to be replaced on some of them and
+     is additionally either missing or undeclared on some other platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       #  endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+*/
+
+/* _GL_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C extern "C"
+#else
+# define _GL_EXTERN_C extern
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
+   declares a replacement function, named rpl_func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
+
+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
+   declares the system function, named func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype func parameters_and_attributes
+
+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+ */
+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      rettype (*const func) parameters = ::rpl_func;          \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
+   except that the C function rpl_func may have a slightly different
+   declaration.  A cast is used to silence the "invalid conversion" error
+   that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                     \
+    {                                                              \
+      rettype (*const func) parameters =                           \
+        reinterpret_cast<rettype(*)parameters>(::rpl_func);        \
+    }                                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to the system provided function func, if GNULIB_NAMESPACE
+   is defined.
+   Example:
+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+ */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* If we were to write
+       rettype (*const func) parameters = ::func;
+     like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
+     better (remove an indirection through a 'static' pointer variable),
+     but then the _GL_CXXALIASWARN macro below would cause a warning not only
+     for uses of ::func but also for uses of GNULIB_NAMESPACE::func.  */
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                     \
+    {                                              \
+      static rettype (*func) parameters = ::func;  \
+    }                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                          \
+    {                                                   \
+      static rettype (*func) parameters =               \
+        reinterpret_cast<rettype(*)parameters>(::func); \
+    }                                                   \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function is picked among a set of overloaded functions,
+   namely the one with rettype2 and parameters2.  Two consecutive casts
+   are used to silence the "cannot find a match" and "invalid conversion"
+   errors that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* The outer cast must be a reinterpret_cast.
+     The inner cast: When the function is defined as a set of overloaded
+     functions, it works as a static_cast<>, choosing the designated variant.
+     When the function is defined as a single variant, it works as a
+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    namespace GNULIB_NAMESPACE                                                \
+    {                                                                         \
+      static rettype (*func) parameters =                                     \
+        reinterpret_cast<rettype(*)parameters>(                               \
+          (rettype2(*)parameters2)(::func));                                  \
+    }                                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN (func);
+   causes a warning to be emitted when ::func is used but not when
+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
+   variants.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN(func) \
+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+   _GL_CXXALIASWARN_2 (func, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+    _GL_WARN_ON_USE (func, \
+                     "The symbol ::" #func " refers to the system function. " \
+                     "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN(func) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+   causes a warning to be emitted when the given overloaded variant of ::func
+   is used but not when GNULIB_NAMESPACE::func is used.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+                        GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
+                         "The symbol ::" #func " refers to the system function. " \
+                         "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+#endif /* _GL_CXXDEFS_H */

build-aux/snippet/warn-on-use.h

@@ -0,0 +1,109 @@
+/* A C macro for emitting warnings if a function is used.
+   Copyright (C) 2010-2013 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/>.  */
+
+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
+   for FUNCTION which will then trigger a compiler warning containing
+   the text of "literal string" anywhere that function is called, if
+   supported by the compiler.  If the compiler does not support this
+   feature, the macro expands to an unused extern declaration.
+
+   This macro is useful for marking a function as a potential
+   portability trap, with the intent that "literal string" include
+   instructions on the replacement function that should be used
+   instead.  However, one of the reasons that a function is a
+   portability trap is if it has the wrong signature.  Declaring
+   FUNCTION with a different signature in C is a compilation error, so
+   this macro must use the same type as any existing declaration so
+   that programs that avoid the problematic FUNCTION do not fail to
+   compile merely because they included a header that poisoned the
+   function.  But this implies that _GL_WARN_ON_USE is only safe to
+   use if FUNCTION is known to already have a declaration.  Use of
+   this macro implies that there must not be any other macro hiding
+   the declaration of FUNCTION; but undefining FUNCTION first is part
+   of the poisoning process anyway (although for symbols that are
+   provided only via a macro, the result is a compilation error rather
+   than a warning containing "literal string").  Also note that in
+   C++, it is only safe to use if FUNCTION has no overloads.
+
+   For an example, it is possible to poison 'getline' by:
+   - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
+     [getline]) in configure.ac, which potentially defines
+     HAVE_RAW_DECL_GETLINE
+   - adding this code to a header that wraps the system <stdio.h>:
+     #undef getline
+     #if HAVE_RAW_DECL_GETLINE
+     _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
+       "not universally present; use the gnulib module getline");
+     #endif
+
+   It is not possible to directly poison global variables.  But it is
+   possible to write a wrapper accessor function, and poison that
+   (less common usage, like &environ, will cause a compilation error
+   rather than issue the nice warning, but the end result of informing
+   the developer about their portability problem is still achieved):
+   #if HAVE_RAW_DECL_ENVIRON
+   static char ***rpl_environ (void) { return &environ; }
+   _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
+   # undef environ
+   # define environ (*rpl_environ ())
+   #endif
+   */
+#ifndef _GL_WARN_ON_USE
+
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
+   is like _GL_WARN_ON_USE (function, "string"), except that the function is
+   declared with the given prototype, consisting of return type, parameters,
+   and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes \
+     __attribute__ ((__warning__ (msg)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif

bus/pci.c

@@ -1,65 +0,0 @@
-/* pci.c - Generic PCI interfaces.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2007,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/pci.h>
-
-grub_pci_address_t
-grub_pci_make_address (grub_pci_device_t dev, int reg)
-{
-  return (1 << 31) | (dev.bus << 16) | (dev.device << 11)
-    | (dev.function << 8) | reg;
-}
-
-void
-grub_pci_iterate (grub_pci_iteratefunc_t hook)
-{
-  grub_pci_device_t dev;
-  grub_pci_address_t addr;
-  grub_pci_id_t id;
-  grub_uint32_t hdr;
-
-  for (dev.bus = 0; dev.bus < GRUB_PCI_NUM_BUS; dev.bus++)
-    {
-      for (dev.device = 0; dev.device < GRUB_PCI_NUM_DEVICES; dev.device++)
-	{
-	  for (dev.function = 0; dev.function < 8; dev.function++)
-	    {
-	      addr = grub_pci_make_address (dev, GRUB_PCI_REG_PCI_ID);
-	      id = grub_pci_read (addr);
-
-	      /* Check if there is a device present.  */
-	      if (id >> 16 == 0xFFFF)
-		continue;
-
-	      if (hook (dev, id))
-		return;
-
-	      /* Probe only func = 0 if the device if not multifunction */
-	      if (dev.function == 0)
-		{
-		  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CACHELINE);
-		  hdr = grub_pci_read (addr);
-		  if (!(hdr & 0x800000))
-		    break;
-		}
-	    }
-	}
-    }
-}

bus/usb/ohci.c

@@ -1,611 +0,0 @@
-/* ohci.c - OHCI Support.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/mm.h>
-#include <grub/usb.h>
-#include <grub/usbtrans.h>
-#include <grub/misc.h>
-#include <grub/pci.h>
-#include <grub/cpu/pci.h>
-#include <grub/i386/io.h>
-#include <grub/time.h>
-
-struct grub_ohci_hcca
-{
-  /* Pointers to Interrupt Endpoint Descriptors.  Not used by
-     GRUB.  */
-  grub_uint32_t inttable[32];
-
-  /* Current frame number.  */
-  grub_uint16_t framenumber;
-
-  grub_uint16_t pad;
-
-  /* List of completed TDs.  */
-  grub_uint32_t donehead;
-
-  grub_uint8_t reserved[116];
-} __attribute__((packed));
-
-/* OHCI Endpoint Descriptor.  */
-struct grub_ohci_ed
-{
-  grub_uint32_t target;
-  grub_uint32_t td_tail;
-  grub_uint32_t td_head;
-  grub_uint32_t next_ed;
-} __attribute__((packed));
-
-struct grub_ohci_td
-{
-  /* Information used to construct the TOKEN packet.  */
-  grub_uint32_t token;
-
-  grub_uint32_t buffer;
-  grub_uint32_t next_td;
-  grub_uint32_t buffer_end;
-} __attribute__((packed));
-
-typedef struct grub_ohci_td *grub_ohci_td_t;
-typedef struct grub_ohci_ed *grub_ohci_ed_t;
-
-struct grub_ohci
-{
-  volatile grub_uint32_t *iobase;
-  volatile struct grub_ohci_hcca *hcca;
-  struct grub_ohci *next;
-};
-
-static struct grub_ohci *ohci;
-
-typedef enum
-{
-  GRUB_OHCI_REG_REVISION = 0x00,
-  GRUB_OHCI_REG_CONTROL,
-  GRUB_OHCI_REG_CMDSTATUS,
-  GRUB_OHCI_REG_INTSTATUS,
-  GRUB_OHCI_REG_INTENA,
-  GRUB_OHCI_REG_INTDIS,
-  GRUB_OHCI_REG_HCCA,
-  GRUB_OHCI_REG_PERIODIC,
-  GRUB_OHCI_REG_CONTROLHEAD,
-  GRUB_OHCI_REG_CONTROLCURR,
-  GRUB_OHCI_REG_BULKHEAD,
-  GRUB_OHCI_REG_BULKCURR,
-  GRUB_OHCI_REG_DONEHEAD,
-  GRUB_OHCI_REG_FRAME_INTERVAL,
-  GRUB_OHCI_REG_RHUBA = 18,
-  GRUB_OHCI_REG_RHUBPORT = 21
-} grub_ohci_reg_t;
-
-static grub_uint32_t
-grub_ohci_readreg32 (struct grub_ohci *o, grub_ohci_reg_t reg)
-{
-  return grub_le_to_cpu32 (*(o->iobase + reg));
-}
-
-static void
-grub_ohci_writereg32 (struct grub_ohci *o,
-		      grub_ohci_reg_t reg, grub_uint32_t val)
-{
-  *(o->iobase + reg) = grub_cpu_to_le32 (val);
-}
-
-
-
-/* Iterate over all PCI devices.  Determine if a device is an OHCI
-   controller.  If this is the case, initialize it.  */
-static int NESTED_FUNC_ATTR
-grub_ohci_pci_iter (grub_pci_device_t dev,
-		    grub_pci_id_t pciid __attribute__((unused)))
-{
-  grub_uint32_t class_code;
-  grub_uint32_t class;
-  grub_uint32_t subclass;
-  grub_uint32_t interf;
-  grub_uint32_t base;
-  grub_pci_address_t addr;
-  struct grub_ohci *o;
-  grub_uint32_t revision;
-  grub_uint32_t frame_interval;
-
-  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
-  class_code = grub_pci_read (addr) >> 8;
-
-  interf = class_code & 0xFF;
-  subclass = (class_code >> 8) & 0xFF;
-  class = class_code >> 16;
-
-  /* If this is not an OHCI controller, just return.  */
-  if (class != 0x0c || subclass != 0x03 || interf != 0x10)
-    return 0;
-
-  /* Determine IO base address.  */
-  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
-  base = grub_pci_read (addr);
-
-#if 0
-  /* Stop if there is no IO space base address defined.  */
-  if (! (base & 1))
-    return 0;
-#endif
-
-  /* Allocate memory for the controller and register it.  */
-  o = grub_malloc (sizeof (*o));
-  if (! o)
-    return 1;
-
-  o->iobase = (grub_uint32_t *) base;
-
-  /* Reserve memory for the HCCA.  */
-  o->hcca = (struct grub_ohci_hcca *) grub_memalign (256, 256);
-
-  grub_dprintf ("ohci", "class=0x%02x 0x%02x interface 0x%02x base=%p\n",
- 		class, subclass, interf, o->iobase);
-
-  /* Check if the OHCI revision is actually 1.0 as supported.  */
-  revision = grub_ohci_readreg32 (o, GRUB_OHCI_REG_REVISION);
-  grub_dprintf ("ohci", "OHCI revision=0x%02x\n", revision & 0xFF);
-  if ((revision & 0xFF) != 0x10)
-    goto fail;
-
-  /* Backup the frame interval register.  */
-  frame_interval = grub_ohci_readreg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL);
-
-  /* Suspend the OHCI by issuing a reset.  */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1); /* XXX: Magic.  */
-  grub_millisleep (1);
-  grub_dprintf ("ohci", "OHCI reset\n");
-
-  /* Restore the frame interval register.  */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL, frame_interval);
-
-  /* Setup the HCCA.  */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, (grub_uint32_t) o->hcca);
-  grub_dprintf ("ohci", "OHCI HCCA\n");
-
-  /* Enable the OHCI.  */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL,
-			(2 << 6));
-  grub_dprintf ("ohci", "OHCI enable: 0x%02x\n",
-		(grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL) >> 6) & 3);
-
-  /* Link to ohci now that initialisation is successful.  */
-  o->next = ohci;
-  ohci = o;
-
-  return 0;
-
- fail:
-  if (o)
-    grub_free ((void *) o->hcca);
-  grub_free (o);
-
-  return 1;
-}
-
-
-static void
-grub_ohci_inithw (void)
-{
-  grub_pci_iterate (grub_ohci_pci_iter);
-}
-
-
-
-static int
-grub_ohci_iterate (int (*hook) (grub_usb_controller_t dev))
-{
-  struct grub_ohci *o;
-  struct grub_usb_controller dev;
-
-  for (o = ohci; o; o = o->next)
-    {
-      dev.data = o;
-      if (hook (&dev))
-	return 1;
-    }
-
-  return 0;
-}
-
-static void
-grub_ohci_transaction (grub_ohci_td_t td,
-		       grub_transfer_type_t type, unsigned int toggle,
-		       grub_size_t size, char *data)
-{
-  grub_uint32_t token;
-  grub_uint32_t buffer;
-  grub_uint32_t buffer_end;
-
-  grub_dprintf ("ohci", "OHCI transaction td=%p type=%d, toggle=%d, size=%d\n",
-		td, type, toggle, size);
-
-  switch (type)
-    {
-    case GRUB_USB_TRANSFER_TYPE_SETUP:
-      token = 0 << 19;
-      break;
-    case GRUB_USB_TRANSFER_TYPE_IN:
-      token = 2 << 19;
-      break;
-    case GRUB_USB_TRANSFER_TYPE_OUT:
-      token = 1 << 19;
-      break;
-    default:
-      token = 0;
-      break;
-    }
-
-  /* Generate no interrupts.  */
-  token |= 7 << 21;
-
-  /* Set the token.  */
-  token |= toggle << 24;
-  token |= 1 << 25;
-
-  buffer = (grub_uint32_t) data;
-  buffer_end = buffer + size - 1;
-
-  td->token = grub_cpu_to_le32 (token);
-  td->buffer = grub_cpu_to_le32 (buffer);
-  td->next_td = 0;
-  td->buffer_end = grub_cpu_to_le32 (buffer_end);
-}
-
-static grub_usb_err_t
-grub_ohci_transfer (grub_usb_controller_t dev,
-		    grub_usb_transfer_t transfer)
-{
-  struct grub_ohci *o = (struct grub_ohci *) dev->data;
-  grub_ohci_ed_t ed;
-  grub_ohci_td_t td_list;
-  grub_uint32_t target;
-  grub_uint32_t td_tail;
-  grub_uint32_t td_head;
-  grub_uint32_t status;
-  grub_uint32_t control;
-  grub_usb_err_t err;
-  int i;
-
-  /* Allocate an Endpoint Descriptor.  */
-  ed = grub_memalign (16, sizeof (*ed));
-  if (! ed)
-    return GRUB_USB_ERR_INTERNAL;
-
-  td_list = grub_memalign (16, sizeof (*td_list) * (transfer->transcnt + 1));
-  if (! td_list)
-    {
-      grub_free ((void *) ed);
-      return GRUB_USB_ERR_INTERNAL;
-    }
-
-  grub_dprintf ("ohci", "alloc=%p\n", td_list);
-
-  /* Setup all Transfer Descriptors.  */
-  for (i = 0; i < transfer->transcnt; i++)
-    {
-      grub_usb_transaction_t tr = &transfer->transactions[i];
-
-      grub_ohci_transaction (&td_list[i], tr->pid, tr->toggle,
-			     tr->size, tr->data);
-
-      td_list[i].next_td = grub_cpu_to_le32 (&td_list[i + 1]);
-    }
-
-  /* Setup the Endpoint Descriptor.  */
-
-  /* Set the device address.  */
-  target = transfer->devaddr;
-
-  /* Set the endpoint.  */
-  target |= transfer->endpoint << 7;
-
-  /* Set the device speed.  */
-  target |= (transfer->dev->speed == GRUB_USB_SPEED_LOW) << 13;
-
-  /* Set the maximum packet size.  */
-  target |= transfer->max << 16;
-
-  td_head = (grub_uint32_t) td_list;
-
-  td_tail = (grub_uint32_t) &td_list[transfer->transcnt];
-
-  ed->target = grub_cpu_to_le32 (target);
-  ed->td_head = grub_cpu_to_le32 (td_head);
-  ed->td_tail = grub_cpu_to_le32 (td_tail);
-  ed->next_ed = grub_cpu_to_le32 (0);
-
-  grub_dprintf ("ohci", "program OHCI\n");
-
-  /* Program the OHCI to actually transfer.  */
-  switch (transfer->type)
-    {
-    case GRUB_USB_TRANSACTION_TYPE_BULK:
-      {
-	grub_dprintf ("ohci", "add to bulk list\n");
-
-	status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
-	control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
-
-	/* Disable the Control and Bulk lists.  */
-	control &= ~(3 << 4);
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
-
-	/* Clear BulkListFilled.  */
-	status &= ~(1 << 2);
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
-
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, (grub_uint32_t) ed);
-
-	/* Enable the Bulk list.  */
-	control |= 1 << 5;
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
-
-	/* Set BulkListFilled.  */
-	status |= 1 << 2;
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
-
-	break;
-      }
-
-    case GRUB_USB_TRANSACTION_TYPE_CONTROL:
-      {
-	grub_dprintf ("ohci", "add to control list\n");
-	status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
-	control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
-
-	/* Disable the Control and Bulk lists.  */
-	control &= ~(3 << 4);
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
-
-	/* Clear ControlListFilled.  */
-	status &= ~(1 << 1);
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
-
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD,
-			      (grub_uint32_t) ed);
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD+1,
-			      (grub_uint32_t) ed);
-
-	/* Enable the Control list.  */
-	control |= 1 << 4;
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
-
-	/* Set ControlListFilled.  */
-	status |= 1 << 1;
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
-	break;
-      }
-    }
-
-  grub_dprintf ("ohci", "wait for completion\n");
-  grub_dprintf ("ohci", "control=0x%02x status=0x%02x\n",
-		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL),
-		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS));
-
-  /* Wait until the transfer is completed or STALLs.  */
-  while ((ed->td_head & ~0xf) != (ed->td_tail & ~0xf))
-    {
-      grub_cpu_idle ();
-
-      grub_dprintf ("ohci", "head=0x%02x tail=0x%02x\n", ed->td_head, ed->td_tail);
-
-      /* Detected a STALL.  */
-      if (ed->td_head & 1)
-	break;
-    }
-
-  grub_dprintf ("ohci", "complete\n");
-
-/*   if (ed->td_head & 1) */
-/*     err = GRUB_USB_ERR_STALL; */
-/*   else if (ed->td */
-
-
-  if (ed->td_head & 1)
-    {
-      grub_uint8_t errcode;
-      grub_ohci_td_t tderr;
-
-      tderr = (grub_ohci_td_t) grub_ohci_readreg32 (o,
-						    GRUB_OHCI_REG_DONEHEAD);
-      errcode = tderr->token >> 28;
-
-      switch (errcode)
-	{
-	case 0:
-	  /* XXX: Should not happen!  */
-	  grub_error (GRUB_ERR_IO, "OHCI without reporting the reason");
-	  err = GRUB_USB_ERR_INTERNAL;
-	  break;
-
-	case 1:
-	  /* XXX: CRC error.  */
-	  err = GRUB_USB_ERR_TIMEOUT;
-	  break;
-
-	case 2:
-	  err = GRUB_USB_ERR_BITSTUFF;
-	  break;
-
-	case 3:
-	  /* XXX: Data Toggle error.  */
-	  err = GRUB_USB_ERR_DATA;
-	  break;
-
-	case 4:
-	  err = GRUB_USB_ERR_STALL;
-	  break;
-
-	case 5:
-	  /* XXX: Not responding.  */
-	  err = GRUB_USB_ERR_TIMEOUT;
-	  break;
-
-	case 6:
-	  /* XXX: PID Check bits failed.  */
-	  err = GRUB_USB_ERR_BABBLE;
-	  break;
-
-	case 7:
-	  /* XXX: PID unexpected failed.  */
-	  err = GRUB_USB_ERR_BABBLE;
-	  break;
-
-	case 8:
-	  /* XXX: Data overrun error.  */
-	  err = GRUB_USB_ERR_DATA;
-	  break;
-
-	case 9:
-	  /* XXX: Data underrun error.  */
-	  err = GRUB_USB_ERR_DATA;
-	  break;
-
-	case 10:
-	  /* XXX: Reserved.  */
-	  err = GRUB_USB_ERR_NAK;
-	  break;
-
-	case 11:
-	  /* XXX: Reserved.  */
-	  err = GRUB_USB_ERR_NAK;
-	  break;
-
-	case 12:
-	  /* XXX: Buffer overrun.  */
-	  err = GRUB_USB_ERR_DATA;
-	  break;
-
-	case 13:
-	  /* XXX: Buffer underrun.  */
-	  err = GRUB_USB_ERR_DATA;
-	  break;
-
-	default:
-	  err = GRUB_USB_ERR_NAK;
-	  break;
-	}
-    }
-  else
-    err = GRUB_USB_ERR_NONE;
-
-  /* Disable the Control and Bulk lists.  */
-  control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
-  control &= ~(3 << 4);
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
-
-  /* Clear BulkListFilled and ControlListFilled.  */
-  status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
-  status &= ~((1 << 2) | (1 << 3));
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
-
-  /* XXX */
-  grub_free (td_list);
-  grub_free (ed);
-
-  return err;
-}
-
-static grub_err_t
-grub_ohci_portstatus (grub_usb_controller_t dev,
-		      unsigned int port, unsigned int enable)
-{
-   struct grub_ohci *o = (struct grub_ohci *) dev->data;
-   grub_uint32_t status;
-
-   /* Reset the port.  */
-   status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port);
-   status |= (1 << 4); /* XXX: Magic.  */
-   grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port, status);
-   grub_millisleep (100);
-
-   /* End the reset signaling.  */
-   status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port);
-   status |= (1 << 20); /* XXX: Magic.  */
-   grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port, status);
-   grub_millisleep (10);
-
-   /* Enable the port.  */
-   status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port);
-   status |= (enable << 1); /* XXX: Magic.  */
-   grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port, status);
-
-   status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port);
-   grub_dprintf ("ohci", "portstatus=0x%02x\n", status);
-
-   return GRUB_ERR_NONE;
-}
-
-static grub_usb_speed_t
-grub_ohci_detect_dev (grub_usb_controller_t dev, int port)
-{
-   struct grub_ohci *o = (struct grub_ohci *) dev->data;
-   grub_uint32_t status;
-
-   status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port);
-
-   grub_dprintf ("ohci", "detect_dev status=0x%02x\n", status);
-
-   if (! (status & 1))
-     return GRUB_USB_SPEED_NONE;
-   else if (status & (1 << 9))
-     return GRUB_USB_SPEED_LOW;
-   else
-     return GRUB_USB_SPEED_FULL;
-}
-
-static int
-grub_ohci_hubports (grub_usb_controller_t dev)
-{
-  struct grub_ohci *o = (struct grub_ohci *) dev->data;
-  grub_uint32_t portinfo;
-
-  portinfo = grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBA);
-
-  grub_dprintf ("ohci", "root hub ports=%d\n", portinfo & 0xFF);
-
-  /* The root hub has exactly two ports.  */
-  return portinfo & 0xFF;
-}
-
-
-
-static struct grub_usb_controller_dev usb_controller =
-{
-  .name = "ohci",
-  .iterate = grub_ohci_iterate,
-  .transfer = grub_ohci_transfer,
-  .hubports = grub_ohci_hubports,
-  .portstatus = grub_ohci_portstatus,
-  .detect_dev = grub_ohci_detect_dev
-};
-
-GRUB_MOD_INIT(ohci)
-{
-  grub_ohci_inithw ();
-  grub_usb_controller_dev_register (&usb_controller);
-}
-
-GRUB_MOD_FINI(ohci)
-{
-  grub_usb_controller_dev_unregister (&usb_controller);
-}

bus/usb/uhci.c

@@ -1,689 +0,0 @@
-/* uhci.c - UHCI Support.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/mm.h>
-#include <grub/misc.h>
-#include <grub/usb.h>
-#include <grub/usbtrans.h>
-#include <grub/pci.h>
-#include <grub/i386/io.h>
-#include <grub/time.h>
-
-#define GRUB_UHCI_IOMASK	(0x7FF << 5)
-
-typedef enum
-  {
-    GRUB_UHCI_REG_USBCMD = 0x00,
-    GRUB_UHCI_REG_FLBASEADD = 0x08,
-    GRUB_UHCI_REG_PORTSC1 = 0x10,
-    GRUB_UHCI_REG_PORTSC2 = 0x12
-  } grub_uhci_reg_t;
-
-#define GRUB_UHCI_LINK_TERMINATE	1
-#define GRUB_UHCI_LINK_QUEUE_HEAD	2
-
-
-/* UHCI Queue Head.  */
-struct grub_uhci_qh
-{
-  /* Queue head link pointer which points to the next queue head.  */
-  grub_uint32_t linkptr;
-
-  /* Queue element link pointer which points to the first data object
-     within the queue.  */
-  grub_uint32_t elinkptr;
-
-  /* Queue heads are aligned on 16 bytes, pad so a queue head is 16
-     bytes so we can store many in a 4K page.  */
-  grub_uint8_t pad[8];
-} __attribute__ ((packed));
-
-/* UHCI Transfer Descriptor.  */
-struct grub_uhci_td
-{
-  /* Pointer to the next TD in the list.  */
-  grub_uint32_t linkptr;
-
-  /* Control and status bits.  */
-  grub_uint32_t ctrl_status;
-
-  /* All information required to transfer the Token packet.  */
-  grub_uint32_t token;
-
-  /* A pointer to the data buffer, UHCI requires this pointer to be 32
-     bits.  */
-  grub_uint32_t buffer;
-
-  /* Another linkptr that is not overwritten by the Host Controller.
-     This is GRUB specific.  */
-  grub_uint32_t linkptr2;
-
-  /* 3 additional 32 bits words reserved for the Host Controller Driver.  */
-  grub_uint32_t data[3];
-} __attribute__ ((packed));
-
-typedef volatile struct grub_uhci_td *grub_uhci_td_t;
-typedef volatile struct grub_uhci_qh *grub_uhci_qh_t;
-
-struct grub_uhci
-{
-  int iobase;
-  grub_uint32_t *framelist;
-
-  /* 256 Queue Heads.  */
-  grub_uhci_qh_t qh;
-
-  /* 256 Transfer Descriptors.  */
-  grub_uhci_td_t td;
-
-  /* Free Transfer Descriptors.  */
-  grub_uhci_td_t tdfree;
-
-  struct grub_uhci *next;
-};
-
-static struct grub_uhci *uhci;
-
-static grub_uint16_t
-grub_uhci_readreg16 (struct grub_uhci *u, grub_uhci_reg_t reg)
-{
-  return grub_inw (u->iobase + reg);
-}
-
-#if 0
-static grub_uint32_t
-grub_uhci_readreg32 (struct grub_uhci *u, grub_uhci_reg_t reg)
-{
-  return grub_inl (u->iobase + reg);
-}
-#endif
-
-static void
-grub_uhci_writereg16 (struct grub_uhci *u,
-		      grub_uhci_reg_t reg, grub_uint16_t val)
-{
-  grub_outw (val, u->iobase + reg);
-}
-
-static void
-grub_uhci_writereg32 (struct grub_uhci *u,
-		    grub_uhci_reg_t reg, grub_uint32_t val)
-{
-  grub_outl (val, u->iobase + reg);
-}
-
-static grub_err_t
-grub_uhci_portstatus (grub_usb_controller_t dev,
-		      unsigned int port, unsigned int enable);
-
-
-/* Iterate over all PCI devices.  Determine if a device is an UHCI
-   controller.  If this is the case, initialize it.  */
-static int NESTED_FUNC_ATTR
-grub_uhci_pci_iter (grub_pci_device_t dev,
-		    grub_pci_id_t pciid __attribute__((unused)))
-{
-  grub_uint32_t class_code;
-  grub_uint32_t class;
-  grub_uint32_t subclass;
-  grub_uint32_t interf;
-  grub_uint32_t base;
-  grub_uint32_t fp;
-  grub_pci_address_t addr;
-  struct grub_uhci *u;
-  int i;
-
-  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
-  class_code = grub_pci_read (addr) >> 8;
-
-  interf = class_code & 0xFF;
-  subclass = (class_code >> 8) & 0xFF;
-  class = class_code >> 16;
-
-  /* If this is not an UHCI controller, just return.  */
-  if (class != 0x0c || subclass != 0x03 || interf != 0x00)
-    return 0;
-
-  /* Determine IO base address.  */
-  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG4);
-  base = grub_pci_read (addr);
-  /* Stop if there is no IO space base address defined.  */
-  if (! (base & 1))
-    return 0;
-
-  /* Allocate memory for the controller and register it.  */
-  u = grub_zalloc (sizeof (*u));
-  if (! u)
-    return 1;
-
-  u->iobase = base & GRUB_UHCI_IOMASK;
-  grub_dprintf ("uhci", "class=0x%02x 0x%02x interface 0x%02x base=0x%x\n",
-		class, subclass, interf, u->iobase);
-
-  /* Reserve a page for the frame list.  */
-  u->framelist = grub_memalign (4096, 4096);
-  if (! u->framelist)
-    goto fail;
-
-  /* The framelist pointer of UHCI is only 32 bits, make sure this
-     code works on on 64 bits architectures.  */
-#if GRUB_CPU_SIZEOF_VOID_P == 8
-  if ((grub_uint64_t) u->framelist >> 32)
-    {
-      grub_error (GRUB_ERR_OUT_OF_MEMORY,
-		  "allocated frame list memory not <4GB");
-      goto fail;
-    }
-#endif
-
-  /* The QH pointer of UHCI is only 32 bits, make sure this
-     code works on on 64 bits architectures.  */
-  u->qh = (grub_uhci_qh_t) grub_memalign (4096, 4096);
-  if (! u->qh)
-    goto fail;
-
-#if GRUB_CPU_SIZEOF_VOID_P == 8
-  if ((grub_uint64_t) u->qh >> 32)
-    {
-      grub_error (GRUB_ERR_OUT_OF_MEMORY, "allocated QH memory not <4GB");
-      goto fail;
-    }
-#endif
-
-  /* The TD pointer of UHCI is only 32 bits, make sure this
-     code works on on 64 bits architectures.  */
-  u->td = (grub_uhci_td_t) grub_memalign (4096, 4096*2);
-  if (! u->td)
-    goto fail;
-
-#if GRUB_CPU_SIZEOF_VOID_P == 8
-  if ((grub_uint64_t) u->td >> 32)
-    {
-      grub_error (GRUB_ERR_OUT_OF_MEMORY, "allocated TD memory not <4GB");
-      goto fail;
-    }
-#endif
-
-  /* Link all Transfer Descriptors in a list of available Transfer
-     Descriptors.  */
-  for (i = 0; i < 256; i++)
-    u->td[i].linkptr = (grub_uint32_t) &u->td[i + 1];
-  u->td[255 - 1].linkptr = 0;
-  u->tdfree = u->td;
-
-  /* Make sure UHCI is disabled!  */
-  grub_uhci_writereg16 (u, GRUB_UHCI_REG_USBCMD, 0);
-
-  /* Setup the frame list pointers.  Since no isochronous transfers
-     are and will be supported, they all point to the (same!) queue
-     head.  */
-  fp = (grub_uint32_t) u->qh & (~15);
-  /* Mark this as a queue head.  */
-  fp |= 2;
-  for (i = 0; i < 1024; i++)
-    u->framelist[i] = fp;
-  /* Program the framelist address into the UHCI controller.  */
-  grub_uhci_writereg32 (u, GRUB_UHCI_REG_FLBASEADD,
-			(grub_uint32_t) u->framelist);
-
-  /* Make the Queue Heads point to each other.  */
-  for (i = 0; i < 256; i++)
-    {
-      /* Point to the next QH.  */
-      u->qh[i].linkptr = (grub_uint32_t) (&u->qh[i + 1]) & (~15);
-
-      /* This is a QH.  */
-      u->qh[i].linkptr |= GRUB_UHCI_LINK_QUEUE_HEAD;
-
-      /* For the moment, do not point to a Transfer Descriptor.  These
-	 are set at transfer time, so just terminate it.  */
-      u->qh[i].elinkptr = 1;
-    }
-
-  /* The last Queue Head should terminate.  256 are too many QHs so
-     just use 50.  */
-  u->qh[50 - 1].linkptr = 1;
-
-  /* Enable UHCI again.  */
-  grub_uhci_writereg16 (u, GRUB_UHCI_REG_USBCMD, 1 | (1 << 7));
-
-  /* UHCI is initialized and ready for transfers.  */
-  grub_dprintf ("uhci", "UHCI initialized\n");
-
-
-#if 0
-  {
-    int i;
-    for (i = 0; i < 10; i++)
-      {
-	grub_uint16_t frnum;
-
-	frnum = grub_uhci_readreg16 (u, 6);
-	grub_dprintf ("uhci", "Framenum=%d\n", frnum);
-	grub_millisleep (100);
-      }
-  }
-#endif
-
-  /* Link to uhci now that initialisation is successful.  */
-  u->next = uhci;
-  uhci = u;
-
-  return 0;
-
- fail:
-  if (u)
-    {
-      grub_free ((void *) u->qh);
-      grub_free (u->framelist);
-    }
-  grub_free (u);
-
-  return 1;
-}
-
-static void
-grub_uhci_inithw (void)
-{
-  grub_pci_iterate (grub_uhci_pci_iter);
-}
-
-static grub_uhci_td_t
-grub_alloc_td (struct grub_uhci *u)
-{
-  grub_uhci_td_t ret;
-
-  /* Check if there is a Transfer Descriptor available.  */
-  if (! u->tdfree)
-    return NULL;
-
-  ret = u->tdfree;
-  u->tdfree = (grub_uhci_td_t) u->tdfree->linkptr;
-
-  return ret;
-}
-
-static void
-grub_free_td (struct grub_uhci *u, grub_uhci_td_t td)
-{
-  td->linkptr = (grub_uint32_t) u->tdfree;
-  u->tdfree = td;
-}
-
-static void
-grub_free_queue (struct grub_uhci *u, grub_uhci_td_t td)
-{
-  /* Free the TDs in this queue.  */
-  while (td)
-    {
-      grub_uhci_td_t tdprev;
-
-      /* Unlink the queue.  */
-      tdprev = td;
-      td = (grub_uhci_td_t) td->linkptr2;
-
-      /* Free the TD.  */
-      grub_free_td (u, tdprev);
-    }
-}
-
-static grub_uhci_qh_t
-grub_alloc_qh (struct grub_uhci *u,
-	       grub_transaction_type_t tr __attribute__((unused)))
-{
-  int i;
-  grub_uhci_qh_t qh;
-
-  /* Look for a Queue Head for this transfer.  Skip the first QH if
-     this is a Interrupt Transfer.  */
-#if 0
-  if (tr == GRUB_USB_TRANSACTION_TYPE_INTERRUPT)
-    i = 0;
-  else
-#endif
-    i = 1;
-
-  for (; i < 255; i++)
-    {
-      if (u->qh[i].elinkptr & 1)
-	break;
-    }
-  qh = &u->qh[i];
-  if (! (qh->elinkptr & 1))
-    {
-      grub_error (GRUB_ERR_OUT_OF_MEMORY,
-		  "no free queue heads available");
-      return NULL;
-    }
-
-  return qh;
-}
-
-static grub_uhci_td_t
-grub_uhci_transaction (struct grub_uhci *u, unsigned int endp,
-		       grub_transfer_type_t type, unsigned int addr,
-		       unsigned int toggle, grub_size_t size,
-		       char *data)
-{
-  grub_uhci_td_t td;
-  static const unsigned int tf[] = { 0x69, 0xE1, 0x2D };
-
-  /* XXX: Check if data is <4GB.  If it isn't, just copy stuff around.
-     This is only relevant for 64 bits architectures.  */
-
-  /* Grab a free Transfer Descriptor and initialize it.  */
-  td = grub_alloc_td (u);
-  if (! td)
-    {
-      grub_error (GRUB_ERR_OUT_OF_MEMORY,
-		  "no transfer descriptors available for UHCI transfer");
-      return 0;
-    }
-
-  grub_dprintf ("uhci",
-		"transaction: endp=%d, type=%d, addr=%d, toggle=%d, size=%d data=%p td=%p\n",
-		endp, type, addr, toggle, size, data, td);
-
-  /* Don't point to any TD, just terminate.  */
-  td->linkptr = 1;
-
-  /* Active!  Only retry a transfer 3 times.  */
-  td->ctrl_status = (1 << 23) | (3 << 27);
-
-  /* If zero bytes are transmitted, size is 0x7FF.  Otherwise size is
-     size-1.  */
-  if (size == 0)
-    size = 0x7FF;
-  else
-    size = size - 1;
-
-  /* Setup whatever is required for the token packet.  */
-  td->token = ((size << 21) | (toggle << 19) | (endp << 15)
-	       | (addr << 8) | tf[type]);
-
-  td->buffer = (grub_uint32_t) data;
-
-  return td;
-}
-
-static grub_usb_err_t
-grub_uhci_transfer (grub_usb_controller_t dev,
-		    grub_usb_transfer_t transfer)
-{
-  struct grub_uhci *u = (struct grub_uhci *) dev->data;
-  grub_uhci_qh_t qh;
-  grub_uhci_td_t td;
-  grub_uhci_td_t td_first = NULL;
-  grub_uhci_td_t td_prev = NULL;
-  grub_usb_err_t err = GRUB_USB_ERR_NONE;
-  int i;
-  grub_uint64_t endtime;
-
-  /* Allocate a queue head for the transfer queue.  */
-  qh = grub_alloc_qh (u, GRUB_USB_TRANSACTION_TYPE_CONTROL);
-  if (! qh)
-    return grub_errno;
-
-  for (i = 0; i < transfer->transcnt; i++)
-    {
-      grub_usb_transaction_t tr = &transfer->transactions[i];
-
-      td = grub_uhci_transaction (u, transfer->endpoint, tr->pid,
-				  transfer->devaddr, tr->toggle,
-				  tr->size, tr->data);
-      if (! td)
-	{
-	  /* Terminate and free.  */
-	  td_prev->linkptr2 = 0;
-	  td_prev->linkptr = 1;
-
-	  if (td_first)
-	    grub_free_queue (u, td_first);
-
-	  return GRUB_USB_ERR_INTERNAL;
-	}
-
-      if (! td_first)
-	td_first = td;
-      else
-	{
-	  td_prev->linkptr2 = (grub_uint32_t) td;
-	  td_prev->linkptr = (grub_uint32_t) td;
-	  td_prev->linkptr |= 4;
-	}
-      td_prev = td;
-    }
-  td_prev->linkptr2 = 0;
-  td_prev->linkptr = 1;
-
-  grub_dprintf ("uhci", "setup transaction %d\n", transfer->type);
-
-  /* Link it into the queue and terminate.  Now the transaction can
-     take place.  */
-  qh->elinkptr = (grub_uint32_t) td_first;
-
-  grub_dprintf ("uhci", "initiate transaction\n");
-
-  /* Wait until either the transaction completed or an error
-     occurred.  */
-  endtime = grub_get_time_ms () + 1000;
-  for (;;)
-    {
-      grub_uhci_td_t errtd;
-
-      errtd = (grub_uhci_td_t) (qh->elinkptr & ~0x0f);
-
-      grub_dprintf ("uhci", ">t status=0x%02x data=0x%02x td=%p\n",
-		    errtd->ctrl_status, errtd->buffer & (~15), errtd);
-
-      /* Check if the transaction completed.  */
-      if (qh->elinkptr & 1)
-	break;
-
-      grub_dprintf ("uhci", "t status=0x%02x\n", errtd->ctrl_status);
-
-      /* Check if the TD is not longer active.  */
-      if (! (errtd->ctrl_status & (1 << 23)))
-	{
-	  grub_dprintf ("uhci", ">>t status=0x%02x\n", errtd->ctrl_status);
-
-	  /* Check if the endpoint is stalled.  */
-	  if (errtd->ctrl_status & (1 << 22))
-	    err = GRUB_USB_ERR_STALL;
-
-	  /* Check if an error related to the data buffer occurred.  */
-	  if (errtd->ctrl_status & (1 << 21))
-	    err = GRUB_USB_ERR_DATA;
-
-	  /* Check if a babble error occurred.  */
-	  if (errtd->ctrl_status & (1 << 20))
-	    err = GRUB_USB_ERR_BABBLE;
-
-	  /* Check if a NAK occurred.  */
-	  if (errtd->ctrl_status & (1 << 19))
-	    err = GRUB_USB_ERR_NAK;
-
-	  /* Check if a timeout occurred.  */
-	  if (errtd->ctrl_status & (1 << 18))
-	    err = GRUB_USB_ERR_TIMEOUT;
-
-	  /* Check if a bitstuff error occurred.  */
-	  if (errtd->ctrl_status & (1 << 17))
-	    err = GRUB_USB_ERR_BITSTUFF;
-
-	  if (err)
-	    goto fail;
-
-	  /* Fall through, no errors occurred, so the QH might be
-	     updated.  */
-	  grub_dprintf ("uhci", "transaction fallthrough\n");
-	}
-      if (grub_get_time_ms () > endtime)
-	{
-	  err = GRUB_USB_ERR_STALL;
-	  grub_dprintf ("uhci", "transaction timed out\n");
-	  goto fail;
-	}
-      grub_cpu_idle ();
-    }
-
-  grub_dprintf ("uhci", "transaction complete\n");
-
- fail:
-
-  grub_dprintf ("uhci", "transaction failed\n");
-
-  /* Place the QH back in the free list and deallocate the associated
-     TDs.  */
-  qh->elinkptr = 1;
-  grub_free_queue (u, td_first);
-
-  return err;
-}
-
-static int
-grub_uhci_iterate (int (*hook) (grub_usb_controller_t dev))
-{
-  struct grub_uhci *u;
-  struct grub_usb_controller dev;
-
-  for (u = uhci; u; u = u->next)
-    {
-      dev.data = u;
-      if (hook (&dev))
-	return 1;
-    }
-
-  return 0;
-}
-
-static grub_err_t
-grub_uhci_portstatus (grub_usb_controller_t dev,
-		      unsigned int port, unsigned int enable)
-{
-  struct grub_uhci *u = (struct grub_uhci *) dev->data;
-  int reg;
-  unsigned int status;
-  grub_uint64_t endtime;
-
-  grub_dprintf ("uhci", "enable=%d port=%d\n", enable, port);
-
-  if (port == 0)
-    reg = GRUB_UHCI_REG_PORTSC1;
-  else if (port == 1)
-    reg = GRUB_UHCI_REG_PORTSC2;
-  else
-    return grub_error (GRUB_ERR_OUT_OF_RANGE,
-		       "UHCI Root Hub port does not exist");
-
-  status = grub_uhci_readreg16 (u, reg);
-  grub_dprintf ("uhci", "detect=0x%02x\n", status);
-
-  /* Reset the port.  */
-  grub_uhci_writereg16 (u, reg, enable << 9);
-
-  /* Wait for the reset to complete.  XXX: How long exactly?  */
-  grub_millisleep (10);
-  status = grub_uhci_readreg16 (u, reg);
-  grub_uhci_writereg16 (u, reg, status & ~(1 << 9));
-  grub_dprintf ("uhci", "reset completed\n");
-  grub_millisleep (10);
-
-  /* Enable the port.  */
-  grub_uhci_writereg16 (u, reg, enable << 2);
-  grub_millisleep (10);
-
-  grub_dprintf ("uhci", "waiting for the port to be enabled\n");
-
-  endtime = grub_get_time_ms () + 1000;
-  while (! (grub_uhci_readreg16 (u, reg) & (1 << 2)))
-    if (grub_get_time_ms () > endtime)
-      return grub_error (GRUB_ERR_IO, "UHCI Timed out");
-
-  status = grub_uhci_readreg16 (u, reg);
-  grub_dprintf ("uhci", ">3detect=0x%02x\n", status);
-
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_usb_speed_t
-grub_uhci_detect_dev (grub_usb_controller_t dev, int port)
-{
-  struct grub_uhci *u = (struct grub_uhci *) dev->data;
-  int reg;
-  unsigned int status;
-
-  if (port == 0)
-    reg = GRUB_UHCI_REG_PORTSC1;
-  else if (port == 1)
-    reg = GRUB_UHCI_REG_PORTSC2;
-  else
-    return grub_error (GRUB_ERR_OUT_OF_RANGE,
-		       "UHCI Root Hub port does not exist");
-
-  status = grub_uhci_readreg16 (u, reg);
-
-  grub_dprintf ("uhci", "detect=0x%02x port=%d\n", status, port);
-
-  if (! (status & 1))
-    return GRUB_USB_SPEED_NONE;
-  else if (status & (1 << 8))
-    return GRUB_USB_SPEED_LOW;
-  else
-    return GRUB_USB_SPEED_FULL;
-}
-
-static int
-grub_uhci_hubports (grub_usb_controller_t dev __attribute__((unused)))
-{
-  /* The root hub has exactly two ports.  */
-  return 2;
-}
-
-
-static struct grub_usb_controller_dev usb_controller =
-{
-  .name = "uhci",
-  .iterate = grub_uhci_iterate,
-  .transfer = grub_uhci_transfer,
-  .hubports = grub_uhci_hubports,
-  .portstatus = grub_uhci_portstatus,
-  .detect_dev = grub_uhci_detect_dev
-};
-
-GRUB_MOD_INIT(uhci)
-{
-  grub_uhci_inithw ();
-  grub_usb_controller_dev_register (&usb_controller);
-  grub_dprintf ("uhci", "registered\n");
-}
-
-GRUB_MOD_FINI(uhci)
-{
-  struct grub_uhci *u;
-
-  /* Disable all UHCI controllers.  */
-  for (u = uhci; u; u = u->next)
-    grub_uhci_writereg16 (u, GRUB_UHCI_REG_USBCMD, 0);
-
-  /* Unregister the controller.  */
-  grub_usb_controller_dev_unregister (&usb_controller);
-}

bus/usb/usb.c

@@ -1,227 +0,0 @@
-/* usb.c - Generic USB interfaces.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/mm.h>
-#include <grub/usb.h>
-#include <grub/misc.h>
-
-static grub_usb_controller_dev_t grub_usb_list;
-
-void
-grub_usb_controller_dev_register (grub_usb_controller_dev_t usb)
-{
-  auto int iterate_hook (grub_usb_controller_t dev);
-
-  /* Iterate over all controllers found by the driver.  */
-  int iterate_hook (grub_usb_controller_t dev)
-    {
-      dev->dev = usb;
-
-      /* Enable the ports of the USB Root Hub.  */
-      grub_usb_root_hub (dev);
-
-      return 0;
-    }
-
-  usb->next = grub_usb_list;
-  grub_usb_list = usb;
-
-  if (usb->iterate)
-    usb->iterate (iterate_hook);
-}
-
-void
-grub_usb_controller_dev_unregister (grub_usb_controller_dev_t usb)
-{
-  grub_usb_controller_dev_t *p, q;
-
-  for (p = &grub_usb_list, q = *p; q; p = &(q->next), q = q->next)
-    if (q == usb)
-      {
-	*p = q->next;
-	break;
-      }
-}
-
-#if 0
-int
-grub_usb_controller_iterate (int (*hook) (grub_usb_controller_t dev))
-{
-  grub_usb_controller_dev_t p;
-
-  auto int iterate_hook (grub_usb_controller_t dev);
-
-  int iterate_hook (grub_usb_controller_t dev)
-    {
-      dev->dev = p;
-      if (hook (dev))
-	return 1;
-      return 0;
-    }
-
-  /* Iterate over all controller drivers.  */
-  for (p = grub_usb_list; p; p = p->next)
-    {
-      /* Iterate over the busses of the controllers.  XXX: Actually, a
-	 hub driver should do this.  */
-      if (p->iterate (iterate_hook))
-	return 1;
-    }
-
-  return 0;
-}
-#endif
-
-
-grub_usb_err_t
-grub_usb_clear_halt (grub_usb_device_t dev, int endpoint)
-{
-  dev->toggle[endpoint] = 0;
-  return grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
-				     | GRUB_USB_REQTYPE_STANDARD
-				     | GRUB_USB_REQTYPE_TARGET_ENDP),
-			       GRUB_USB_REQ_CLEAR_FEATURE,
-			       GRUB_USB_FEATURE_ENDP_HALT,
-			       endpoint, 0, 0);
-}
-
-grub_usb_err_t
-grub_usb_set_configuration (grub_usb_device_t dev, int configuration)
-{
-  int i;
-
-  for (i = 0; i < 16; i++)
-    dev->toggle[i] = 0;
-
-  return grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
-				     | GRUB_USB_REQTYPE_STANDARD
-				     | GRUB_USB_REQTYPE_TARGET_DEV),
-			       GRUB_USB_REQ_SET_CONFIGURATION, configuration,
-			       0, 0, NULL);
-}
-
-grub_usb_err_t
-grub_usb_get_descriptor (grub_usb_device_t dev,
-			 grub_uint8_t type, grub_uint8_t index,
-			 grub_size_t size, char *data)
-{
-  return grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
-				     | GRUB_USB_REQTYPE_STANDARD
-				     | GRUB_USB_REQTYPE_TARGET_DEV),
-			       GRUB_USB_REQ_GET_DESCRIPTOR,
-			       (type << 8) | index,
-			       0, size, data);
-}
-
-struct grub_usb_desc_endp *
-grub_usb_get_endpdescriptor (grub_usb_device_t usbdev, int addr)
-{
-  int i;
-
-  for (i = 0; i < usbdev->config[0].descconf->numif; i++)
-    {
-      struct grub_usb_desc_if *interf;
-      int j;
-
-      interf = usbdev->config[0].interf[i].descif;
-
-      for (j = 0; j < interf->endpointcnt; j++)
-	{
-	  struct grub_usb_desc_endp *endp;
-	  endp = &usbdev->config[0].interf[i].descendp[j];
-
-	  if (endp->endp_addr == addr)
-	    return endp;
-	}
-    }
-
-  return NULL;
-}
-
-grub_usb_err_t
-grub_usb_device_initialize (grub_usb_device_t dev)
-{
-  struct grub_usb_desc_device *descdev;
-  struct grub_usb_desc_config config;
-  grub_usb_err_t err;
-  int i;
-
-  err = grub_usb_get_descriptor (dev, GRUB_USB_DESCRIPTOR_DEVICE,
-				 0, sizeof (struct grub_usb_desc_device),
-				 (char *) &dev->descdev);
-  if (err)
-    return err;
-  descdev = &dev->descdev;
-
-  for (i = 0; i < 8; i++)
-    dev->config[i].descconf = NULL;
-
-  for (i = 0; i < descdev->configcnt; i++)
-    {
-      int pos;
-      int currif;
-      char *data;
-
-      /* First just read the first 4 bytes of the configuration
-	 descriptor, after that it is known how many bytes really have
-	 to be read.  */
-      err = grub_usb_get_descriptor (dev, GRUB_USB_DESCRIPTOR_CONFIG, i, 4,
-				     (char *) &config);
-
-      data = grub_malloc (config.totallen);
-      if (! data)
-	{
-	  err = GRUB_USB_ERR_INTERNAL;
-	  goto fail;
-	}
-
-      dev->config[i].descconf = (struct grub_usb_desc_config *) data;
-      err = grub_usb_get_descriptor (dev, GRUB_USB_DESCRIPTOR_CONFIG, i,
-				     config.totallen, data);
-      if (err)
-	goto fail;
-
-      /* Skip the configuration descriptor.  */
-      pos = sizeof (struct grub_usb_desc_config);
-
-      /* Read all interfaces.  */
-      for (currif = 0; currif < dev->config[i].descconf->numif; currif++)
-	{
-	  dev->config[i].interf[currif].descif
-	    = (struct grub_usb_desc_if *) &data[pos];
-	  pos += sizeof (struct grub_usb_desc_if);
-
-	  /* Point to the first endpoint.  */
-	  dev->config[i].interf[currif].descendp
-	    = (struct grub_usb_desc_endp *) &data[pos];
-	  pos += (sizeof (struct grub_usb_desc_endp)
-		  * dev->config[i].interf[currif].descif->endpointcnt);
-	}
-    }
-
-  return GRUB_USB_ERR_NONE;
-
- fail:
-
-  for (i = 0; i < 8; i++)
-    grub_free (dev->config[i].descconf);
-
-  return err;
-}

bus/usb/usbhub.c

@@ -1,192 +0,0 @@
-/* usb.c - USB Hub Support.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/mm.h>
-#include <grub/usb.h>
-#include <grub/misc.h>
-
-/* USB Supports 127 devices, with device 0 as special case.  */
-static struct grub_usb_device *grub_usb_devs[128];
-
-/* Add a device that currently has device number 0 and resides on
-   CONTROLLER, the Hub reported that the device speed is SPEED.  */
-static grub_usb_device_t
-grub_usb_hub_add_dev (grub_usb_controller_t controller, grub_usb_speed_t speed)
-{
-  grub_usb_device_t dev;
-  int i;
-
-  dev = grub_zalloc (sizeof (struct grub_usb_device));
-  if (! dev)
-    return NULL;
-
-  dev->controller = *controller;
-  dev->speed = speed;
-
-  grub_usb_device_initialize (dev);
-
-  /* Assign a new address to the device.  */
-  for (i = 1; i < 128; i++)
-    {
-      if (! grub_usb_devs[i])
-	break;
-    }
-  if (i == 128)
-    {
-      grub_error (GRUB_ERR_IO, "can't assign address to USB device");
-      return NULL;
-    }
-
-  grub_usb_control_msg (dev,
-			(GRUB_USB_REQTYPE_OUT
-			 | GRUB_USB_REQTYPE_STANDARD
-			 | GRUB_USB_REQTYPE_TARGET_DEV),
-			GRUB_USB_REQ_SET_ADDRESS,
-			i, 0, 0, NULL);
-
-  dev->addr = i;
-  dev->initialized = 1;
-  grub_usb_devs[i] = dev;
-
-  return dev;
-}
-
-
-static grub_err_t
-grub_usb_add_hub (grub_usb_device_t dev)
-{
-  struct grub_usb_usb_hubdesc hubdesc;
-  grub_err_t err;
-  int i;
-
-  grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
-			      | GRUB_USB_REQTYPE_CLASS
-			      | GRUB_USB_REQTYPE_TARGET_DEV),
-			GRUB_USB_REQ_GET_DESCRIPTOR,
-			(GRUB_USB_DESCRIPTOR_HUB << 8) | 0,
-			0, sizeof (hubdesc), (char *) &hubdesc);
-
-  /* Iterate over the Hub ports.  */
-  for (i = 1; i <= hubdesc.portcnt; i++)
-    {
-      grub_uint32_t status;
-
-      /* Get the port status.  */
-      err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
-					| GRUB_USB_REQTYPE_CLASS
-					| GRUB_USB_REQTYPE_TARGET_OTHER),
-				  GRUB_USB_REQ_HUB_GET_PORT_STATUS,
-				  0, i, sizeof (status), (char *) &status);
-
-      /* Just ignore the device if the Hub does not report the
-	 status.  */
-      if (err)
-	continue;
-
-      /* If connected, reset and enable the port.  */
-      if (status & GRUB_USB_HUB_STATUS_CONNECTED)
-	{
-	  grub_usb_speed_t speed;
-
-	  /* Determine the device speed.  */
-	  if (status & GRUB_USB_HUB_STATUS_LOWSPEED)
-	    speed = GRUB_USB_SPEED_LOW;
-	  else
-	    {
-	      if (status & GRUB_USB_HUB_STATUS_HIGHSPEED)
-		speed = GRUB_USB_SPEED_HIGH;
-	      else
-		speed = GRUB_USB_SPEED_FULL;
-	    }
-
-	  /* A device is actually connected to this port, not enable
-	     the port.  XXX: Why 0x03?  According to some docs it
-	     should be 0x0.  Check the specification!  */
-	  err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
-					    | GRUB_USB_REQTYPE_CLASS
-					    | GRUB_USB_REQTYPE_TARGET_OTHER),
-				      0x3, 0x4, i, 0, 0);
-
-	  /* If the Hub does not cooperate for this port, just skip
-	     the port.  */
-	  if (err)
-	    continue;
-
-	  /* Add the device and assign a device address to it.  */
-	  grub_usb_hub_add_dev (&dev->controller, speed);
-	}
-    }
-
-  return GRUB_ERR_NONE;
-}
-
-grub_usb_err_t
-grub_usb_root_hub (grub_usb_controller_t controller)
-{
-  grub_err_t err;
-  int ports;
-  int i;
-
-  /* Query the number of ports the root Hub has.  */
-  ports = controller->dev->hubports (controller);
-
-  for (i = 0; i < ports; i++)
-    {
-      grub_usb_speed_t speed = controller->dev->detect_dev (controller, i);
-
-      if (speed != GRUB_USB_SPEED_NONE)
-	{
-	  grub_usb_device_t dev;
-
-	  /* Enable the port.  */
-	  err = controller->dev->portstatus (controller, i, 1);
-	  if (err)
-	    continue;
-
-	  /* Enable the port and create a device.  */
-	  dev = grub_usb_hub_add_dev (controller, speed);
-	  if (! dev)
-	    continue;
-
-	  /* If the device is a Hub, scan it for more devices.  */
-	  if (dev->descdev.class == 0x09)
-	    grub_usb_add_hub (dev);
-	}
-    }
-
-  return GRUB_USB_ERR_NONE;
-}
-
-int
-grub_usb_iterate (int (*hook) (grub_usb_device_t dev))
-{
-  int i;
-
-  for (i = 0; i < 128; i++)
-    {
-      if (grub_usb_devs[i])
-	{
-	  if (hook (grub_usb_devs[i]))
-	      return 1;
-	}
-    }
-
-  return 0;
-}

bus/usb/usbtrans.c

@@ -1,212 +0,0 @@
-/* usbtrans.c - USB Transfers and Transactions.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/mm.h>
-#include <grub/misc.h>
-#include <grub/usb.h>
-#include <grub/usbtrans.h>
-
-grub_usb_err_t
-grub_usb_control_msg (grub_usb_device_t dev,
-		      grub_uint8_t reqtype,
-		      grub_uint8_t request,
-		      grub_uint16_t value,
-		      grub_uint16_t index,
-		      grub_size_t size, char *data)
-{
-  int i;
-  grub_usb_transfer_t transfer;
-  int datablocks;
-  struct grub_usb_packet_setup setupdata;
-  grub_usb_err_t err;
-  unsigned int max;
-
-  grub_dprintf ("usb",
-		"control: reqtype=0x%02x req=0x%02x val=0x%02x idx=0x%02x size=%d\n",
-		reqtype, request,  value, index, size);
-
-  /* Create a transfer.  */
-  transfer = grub_malloc (sizeof (struct grub_usb_transfer));
-  if (! transfer)
-    return grub_errno;
-
-  /* Determine the maximum packet size.  */
-  if (dev->initialized)
-    max = dev->descdev.maxsize0;
-  else
-    max = 64;
-
-  datablocks = (size + max - 1) / max;
-
-  /* XXX: Discriminate between different types of control
-     messages.  */
-  transfer->transcnt = datablocks + 2;
-  transfer->size = size; /* XXX ? */
-  transfer->endpoint = 0;
-  transfer->devaddr = dev->addr;
-  transfer->type = GRUB_USB_TRANSACTION_TYPE_CONTROL;
-  transfer->max = max;
-  transfer->dev = dev;
-
-  /* Allocate an array of transfer data structures.  */
-  transfer->transactions = grub_malloc (transfer->transcnt
-					* sizeof (struct grub_usb_transfer));
-  if (! transfer->transactions)
-    {
-      grub_free (transfer);
-      return grub_errno;
-    }
-
-  /* Build a Setup packet.  XXX: Endianness.  */
-  setupdata.reqtype = reqtype;
-  setupdata.request = request;
-  setupdata.value = value;
-  setupdata.index = index;
-  setupdata.length = size;
-  transfer->transactions[0].size = sizeof (setupdata);
-  transfer->transactions[0].pid = GRUB_USB_TRANSFER_TYPE_SETUP;
-  transfer->transactions[0].data = (char *) &setupdata;
-  transfer->transactions[0].toggle = 0;
-
-  /* Now the data...  XXX: Is this the right way to transfer control
-     transfers?  */
-  for (i = 0; i < datablocks; i++)
-    {
-      grub_usb_transaction_t tr = &transfer->transactions[i + 1];
-
-      tr->size = (size > max) ? max : size;
-      /* Use the right most bit as the data toggle.  Simple and
-	 effective.  */
-      tr->toggle = !(i & 1);
-      if (reqtype & 128)
-	tr->pid = GRUB_USB_TRANSFER_TYPE_IN;
-      else
-	tr->pid = GRUB_USB_TRANSFER_TYPE_OUT;
-      tr->data = &data[i * max];
-      size -= max;
-    }
-
-  /* End with an empty OUT transaction.  */
-  transfer->transactions[datablocks + 1].size = 0;
-  transfer->transactions[datablocks + 1].data = NULL;
-  if (reqtype & 128)
-    transfer->transactions[datablocks + 1].pid = GRUB_USB_TRANSFER_TYPE_OUT;
-  else
-    transfer->transactions[datablocks + 1].pid = GRUB_USB_TRANSFER_TYPE_IN;
-
-  transfer->transactions[datablocks + 1].toggle = 1;
-
-  err = dev->controller.dev->transfer (&dev->controller, transfer);
-
-  grub_free (transfer->transactions);
-  grub_free (transfer);
-
-  return err;
-}
-
-static grub_usb_err_t
-grub_usb_bulk_readwrite (grub_usb_device_t dev,
-			 int endpoint, grub_size_t size, char *data,
-			 grub_transfer_type_t type)
-{
-  int i;
-  grub_usb_transfer_t transfer;
-  int datablocks;
-  unsigned int max;
-  grub_usb_err_t err;
-  int toggle = dev->toggle[endpoint];
-
-  /* Use the maximum packet size given in the endpoint descriptor.  */
-  if (dev->initialized)
-    {
-      struct grub_usb_desc_endp *endpdesc;
-      endpdesc = grub_usb_get_endpdescriptor (dev, 0);
-
-      if (endpdesc)
-	max = endpdesc->maxpacket;
-      else
-	max = 64;
-    }
-  else
-    max = 64;
-
-  /* Create a transfer.  */
-  transfer = grub_malloc (sizeof (struct grub_usb_transfer));
-  if (! transfer)
-    return grub_errno;
-
-  datablocks = ((size + max - 1) / max);
-  transfer->transcnt = datablocks;
-  transfer->size = size - 1;
-  transfer->endpoint = endpoint;
-  transfer->devaddr = dev->addr;
-  transfer->type = GRUB_USB_TRANSACTION_TYPE_BULK;
-  transfer->max = max;
-  transfer->dev = dev;
-
-  /* Allocate an array of transfer data structures.  */
-  transfer->transactions = grub_malloc (transfer->transcnt
-					* sizeof (struct grub_usb_transfer));
-  if (! transfer->transactions)
-    {
-      grub_free (transfer);
-      return grub_errno;
-    }
-
-  /* Set up all transfers.  */
-  for (i = 0; i < datablocks; i++)
-    {
-      grub_usb_transaction_t tr = &transfer->transactions[i];
-
-      tr->size = (size > max) ? max : size;
-      /* XXX: Use the right most bit as the data toggle.  Simple and
-	 effective.  */
-      tr->toggle = toggle;
-      toggle = toggle ? 0 : 1;
-      tr->pid = type;
-      tr->data = &data[i * max];
-      size -= tr->size;
-    }
-
-  err = dev->controller.dev->transfer (&dev->controller, transfer);
-  grub_dprintf ("usb", "toggle=%d\n", toggle);
-  dev->toggle[endpoint] = toggle;
-
-  grub_free (transfer->transactions);
-  grub_free (transfer);
-
-  return err;
-}
-
-grub_usb_err_t
-grub_usb_bulk_write (grub_usb_device_t dev,
-		     int endpoint, grub_size_t size, char *data)
-{
-  return grub_usb_bulk_readwrite (dev, endpoint, size, data,
-				  GRUB_USB_TRANSFER_TYPE_OUT);
-}
-
-grub_usb_err_t
-grub_usb_bulk_read (grub_usb_device_t dev,
-		    int endpoint, grub_size_t size, char *data)
-{
-  return grub_usb_bulk_readwrite (dev, endpoint, size, data,
-				  GRUB_USB_TRANSFER_TYPE_IN);
-}

commands/blocklist.c

@@ -1,120 +0,0 @@
-/* blocklist.c - print the block list of a file */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/misc.h>
-#include <grub/file.h>
-#include <grub/mm.h>
-#include <grub/disk.h>
-#include <grub/partition.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-
-static grub_err_t
-grub_cmd_blocklist (grub_command_t cmd __attribute__ ((unused)),
-		    int argc, char **args)
-{
-  grub_file_t file;
-  char buf[GRUB_DISK_SECTOR_SIZE];
-  unsigned long start_sector = 0;
-  unsigned num_sectors = 0;
-  int num_entries = 0;
-  grub_disk_addr_t part_start = 0;
-  auto void NESTED_FUNC_ATTR read_blocklist (grub_disk_addr_t sector, unsigned offset,
-			    unsigned length);
-  auto void NESTED_FUNC_ATTR print_blocklist (grub_disk_addr_t sector, unsigned num,
-			     unsigned offset, unsigned length);
-
-  void NESTED_FUNC_ATTR read_blocklist (grub_disk_addr_t sector, unsigned offset,
-		       unsigned length)
-    {
-      if (num_sectors > 0)
-	{
-	  if (start_sector + num_sectors == sector
-	      && offset == 0 && length == GRUB_DISK_SECTOR_SIZE)
-	    {
-	      num_sectors++;
-	      return;
-	    }
-
-	  print_blocklist (start_sector, num_sectors, 0, 0);
-	  num_sectors = 0;
-	}
-
-      if (offset == 0 && length == GRUB_DISK_SECTOR_SIZE)
-	{
-	  start_sector = sector;
-	  num_sectors++;
-	}
-      else
-	print_blocklist (sector, 0, offset, length);
-    }
-
-  void NESTED_FUNC_ATTR print_blocklist (grub_disk_addr_t sector, unsigned num,
-			unsigned offset, unsigned length)
-    {
-      if (num_entries++)
-	grub_printf (",");
-
-      grub_printf ("%llu", (unsigned long long) (sector - part_start));
-      if (num > 0)
-	grub_printf ("+%u", num);
-      if (offset != 0 || length != 0)
-	grub_printf ("[%u-%u]", offset, offset + length);
-    }
-
-  if (argc < 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
-
-  file = grub_file_open (args[0]);
-  if (! file)
-    return grub_errno;
-
-  if (! file->device->disk)
-    return grub_error (GRUB_ERR_BAD_DEVICE,
-		       "this command is available only for disk devices");
-
-  if (file->device->disk->partition)
-    part_start = grub_partition_get_start (file->device->disk->partition);
-
-  file->read_hook = read_blocklist;
-
-  while (grub_file_read (file, buf, sizeof (buf)) > 0)
-    ;
-
-  if (num_sectors > 0)
-    print_blocklist (start_sector, num_sectors, 0, 0);
-
-  grub_file_close (file);
-
-  return grub_errno;
-}
-
-static grub_command_t cmd;
-
-GRUB_MOD_INIT(blocklist)
-{
-  cmd = grub_register_command ("blocklist", grub_cmd_blocklist,
-			       N_("FILE"), N_("Print a block list."));
-}
-
-GRUB_MOD_FINI(blocklist)
-{
-  grub_unregister_command (cmd);
-}

commands/cat.c

@@ -1,88 +0,0 @@
-/* cat.c - command to show the contents of a file  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2005,2007,2008  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/file.h>
-#include <grub/disk.h>
-#include <grub/term.h>
-#include <grub/misc.h>
-#include <grub/gzio.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-
-static grub_err_t
-grub_cmd_cat (grub_command_t cmd __attribute__ ((unused)),
-	      int argc, char **args)
-
-{
-  grub_file_t file;
-  char buf[GRUB_DISK_SECTOR_SIZE];
-  grub_ssize_t size;
-  int key = 0;
-
-  if (argc != 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
-
-  file = grub_gzfile_open (args[0], 1);
-  if (! file)
-    return grub_errno;
-
-  while ((size = grub_file_read (file, buf, sizeof (buf))) > 0
-	 && key != GRUB_TERM_ESC)
-    {
-      int i;
-
-      for (i = 0; i < size; i++)
-	{
-	  unsigned char c = buf[i];
-
-	  if ((grub_isprint (c) || grub_isspace (c)) && c != '\r')
-	    grub_putchar (c);
-	  else
-	    {
-	      grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
-	      grub_printf ("<%x>", (int) c);
-	      grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
-	    }
-	}
-
-      while (grub_checkkey () >= 0 &&
-	     (key = GRUB_TERM_ASCII_CHAR (grub_getkey ())) != GRUB_TERM_ESC)
-	;
-    }
-
-  grub_putchar ('\n');
-  grub_refresh ();
-  grub_file_close (file);
-
-  return 0;
-}
-
-static grub_command_t cmd;
-
-GRUB_MOD_INIT(cat)
-{
-  cmd = grub_register_command_p1 ("cat", grub_cmd_cat,
-				  N_("FILE"), N_("Show the contents of a file."));
-}
-
-GRUB_MOD_FINI(cat)
-{
-  grub_unregister_command (cmd);
-}

commands/crc.c

@@ -1,71 +0,0 @@
-/* crc.c - command to calculate the crc32 checksum of a file  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008,2010  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/disk.h>
-#include <grub/file.h>
-#include <grub/misc.h>
-#include <grub/lib/crc.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-
-static grub_err_t
-grub_cmd_crc (grub_command_t cmd __attribute__ ((unused)),
-	      int argc, char **args)
-
-{
-  grub_file_t file;
-  char buf[GRUB_DISK_SECTOR_SIZE];
-  grub_ssize_t size;
-  grub_uint32_t crc;
-
-  if (argc != 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
-
-  file = grub_file_open (args[0]);
-  if (! file)
-    return 0;
-
-  crc = 0;
-  while ((size = grub_file_read (file, buf, sizeof (buf))) > 0)
-    crc = grub_getcrc32 (crc, buf, size);
-
-  if (grub_errno)
-    goto fail;
-
-  grub_printf ("%08x\n", crc);
-
- fail:
-  grub_file_close (file);
-  return 0;
-}
-
-static grub_command_t cmd;
-
-GRUB_MOD_INIT(crc)
-{
-  cmd = grub_register_command ("crc", grub_cmd_crc,
-			       N_("FILE"),
-			       N_("Calculate the crc32 checksum of a file."));
-}
-
-GRUB_MOD_FINI(crc)
-{
-  grub_unregister_command (cmd);
-}

commands/handler.c

@@ -1,101 +0,0 @@
-/* handler.c - commands to list or select handlers */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/err.h>
-#include <grub/misc.h>
-#include <grub/term.h>
-#include <grub/handler.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-
-static grub_err_t
-grub_cmd_handler (struct grub_command *cmd __attribute__ ((unused)),
-		  int argc, char **args)
-{
-  void *curr_item = 0;
-  grub_handler_class_t head;
-
-  auto int list_item (grub_named_list_t item);
-  int list_item (grub_named_list_t item)
-    {
-      if (item == curr_item)
-	grub_putchar ('*');
-
-      grub_printf ("%s\n", item->name);
-
-      return 0;
-    }
-
-  head = grub_handler_class_list;
-  if (argc == 0)
-    {
-      grub_list_iterate (GRUB_AS_LIST (head), (grub_list_hook_t) list_item);
-    }
-  else
-    {
-      char *class_name;
-      grub_handler_class_t class;
-
-      class_name = args[0];
-      argc--;
-      args++;
-
-      class = grub_named_list_find (GRUB_AS_NAMED_LIST (head), class_name);
-      if (! class)
-	return grub_error (GRUB_ERR_FILE_NOT_FOUND, "class not found");
-
-      if (argc == 0)
-	{
-	  curr_item = class->cur_handler;
-	  grub_list_iterate (GRUB_AS_LIST (class->handler_list),
-			     (grub_list_hook_t) list_item);
-	}
-      else
-	{
-	  grub_handler_t handler;
-
-	  handler =
-	    grub_named_list_find (GRUB_AS_NAMED_LIST (class->handler_list),
-				  args[0]);
-
-	  if (! handler)
-	    return grub_error (GRUB_ERR_FILE_NOT_FOUND, "handler not found");
-
-	  grub_handler_set_current (class, handler);
-	}
-    }
-
-  return 0;
-}
-
-static grub_command_t cmd_handler;
-
-GRUB_MOD_INIT(handler)
-{
-  cmd_handler =
-    grub_register_command ("handler", grub_cmd_handler,
-			   N_("[class [handler]]"),
-			   N_("List or select a handler."));
-}
-
-GRUB_MOD_FINI(handler)
-{
-  grub_unregister_command (cmd_handler);
-}

commands/help.c

@@ -1,143 +0,0 @@
-/* help.c - command to show a help text.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007,2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/misc.h>
-#include <grub/term.h>
-#include <grub/extcmd.h>
-#include <grub/i18n.h>
-#include <grub/mm.h>
-#include <grub/normal.h>
-#include <grub/charset.h>
-
-static grub_err_t
-grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
-	       char **args)
-{
-  int cnt = 0;
-  char *currarg;
-
-  auto int print_command_info (grub_command_t cmd);
-  auto int print_command_help (grub_command_t cmd);
-
-  int print_command_info (grub_command_t cmd)
-    {
-      if ((cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE) &&
-	  (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE))
-	{
-	  struct grub_term_output *term;
-	  const char *summary_translated = _(cmd->summary);
-	  char *command_help;
-	  grub_uint32_t *unicode_command_help;
-	  grub_uint32_t *unicode_last_position;
-	  			      
-	  command_help = grub_xasprintf ("%s %s", cmd->name, summary_translated);
-	  if (!command_help)
-	    return 1;
-
-	  grub_utf8_to_ucs4_alloc (command_help, &unicode_command_help,
-	  			   &unicode_last_position);
-
-	  FOR_ACTIVE_TERM_OUTPUTS(term)
-	  {
-	    unsigned stringwidth;
-	    grub_uint32_t *unicode_last_screen_position;
-
-	    unicode_last_screen_position = unicode_command_help;
-
-	    stringwidth = 0;
-
-	    while (unicode_last_screen_position < unicode_last_position && 
-		   stringwidth < ((grub_term_width (term) / 2) - 2))
-	      {
-		stringwidth
-		  += grub_term_getcharwidth (term,
-					     *unicode_last_screen_position);
-		unicode_last_screen_position++;
-	      }
-
-	    grub_print_ucs4 (unicode_command_help,
-			     unicode_last_screen_position, term);
-	    if (!(cnt % 2))
-	      grub_print_spaces (term, grub_term_width (term) / 2
-				 - stringwidth);
-	  }
-	  if (cnt % 2)
-	    grub_printf ("\n");
-	  cnt++;
-	  
-	  grub_free (command_help);
-	  grub_free (unicode_command_help);
-	}
-      return 0;
-    }
-
-  int print_command_help (grub_command_t cmd)
-    {
-      if (cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE)
-	{
-	  if (! grub_strncmp (cmd->name, currarg, grub_strlen (currarg)))
-	    {
-	      if (cnt++ > 0)
-		grub_printf ("\n\n");
-
-	      if (cmd->flags & GRUB_COMMAND_FLAG_EXTCMD)
-		grub_arg_show_help ((grub_extcmd_t) cmd->data);
-	      else
-		grub_printf ("%s %s %s\n%s\b", _("Usage:"), cmd->name, _(cmd->summary),
-			     _(cmd->description));
-	    }
-	}
-      return 0;
-    }
-
-  if (argc == 0)
-    {
-      grub_command_iterate (print_command_info);
-      if (!(cnt % 2))
-	grub_printf ("\n");
-    }
-  else
-    {
-      int i;
-
-      for (i = 0; i < argc; i++)
-	{
-	  currarg = args[i];
-	  grub_command_iterate (print_command_help);
-	}
-    }
-
-  return 0;
-}
-
-static grub_extcmd_t cmd;
-
-GRUB_MOD_INIT(help)
-{
-  cmd = grub_register_extcmd ("help", grub_cmd_help,
-			      GRUB_COMMAND_FLAG_CMDLINE,
-			      N_("[PATTERN ...]"),
-			      N_("Show a help message."), 0);
-}
-
-GRUB_MOD_FINI(help)
-{
-  grub_unregister_extcmd (cmd);
-}

commands/i386/pc/play.c

@@ -1,269 +0,0 @@
-/* play.c - command to play a tune  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* Lots of this file is borrowed from GNU/Hurd generic-speaker driver.  */
-
-#include <grub/dl.h>
-#include <grub/file.h>
-#include <grub/disk.h>
-#include <grub/term.h>
-#include <grub/misc.h>
-#include <grub/machine/time.h>
-#include <grub/cpu/io.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-
-#define BASE_TEMPO (60 * GRUB_TICKS_PER_SECOND)
-
-/* The speaker port.  */
-#define SPEAKER			0x61
-
-/* If 0, follow state of SPEAKER_DATA bit, otherwise enable output
-   from timer 2.  */
-#define SPEAKER_TMR2		0x01
-
-/* If SPEAKER_TMR2 is not set, this provides direct input into the
-   speaker.  Otherwise, this enables or disables the output from the
-   timer.  */
-#define SPEAKER_DATA		0x02
-
-/* The PIT channel value ports.  You can write to and read from them.
-   Do not mess with timer 0 or 1.  */
-#define PIT_COUNTER_0		0x40
-#define PIT_COUNTER_1		0x41
-#define PIT_COUNTER_2		0x42
-
-/* The frequency of the PIT clock.  */
-#define PIT_FREQUENCY		0x1234dd
-
-/* The PIT control port.  You can only write to it.  Do not mess with
-   timer 0 or 1.  */
-#define PIT_CTRL		0x43
-#define PIT_CTRL_SELECT_MASK	0xc0
-#define PIT_CTRL_SELECT_0	0x00
-#define PIT_CTRL_SELECT_1	0x40
-#define PIT_CTRL_SELECT_2	0x80
-
-/* Read and load control.  */
-#define PIT_CTRL_READLOAD_MASK	0x30
-#define PIT_CTRL_COUNTER_LATCH	0x00	/* Hold timer value until read.  */
-#define PIT_CTRL_READLOAD_LSB	0x10	/* Read/load the LSB.  */
-#define PIT_CTRL_READLOAD_MSB	0x20	/* Read/load the MSB.  */
-#define PIT_CTRL_READLOAD_WORD	0x30	/* Read/load the LSB then the MSB.  */
-
-/* Mode control.  */
-#define PIT_CTRL_MODE_MASK	0x0e
-
-/* Interrupt on terminal count.  Setting the mode sets output to low.
-   When counter is set and terminated, output is set to high.  */
-#define PIT_CTRL_INTR_ON_TERM	0x00
-
-/* Programmable one-shot.  When loading counter, output is set to
-   high.  When counter terminated, output is set to low.  Can be
-   triggered again from that point on by setting the gate pin to
-   high.  */
-#define PIT_CTRL_PROGR_ONE_SHOT	0x02
-
-/* Rate generator.  Output is low for one period of the counter, and
-   high for the other.  */
-#define PIT_CTRL_RATE_GEN	0x04
-
-/* Square wave generator.  Output is low for one half of the period,
-   and high for the other half.  */
-#define PIT_CTRL_SQUAREWAVE_GEN	0x06
-
-/* Software triggered strobe.  Setting the mode sets output to high.
-   When counter is set and terminated, output is set to low.  */
-#define PIT_CTRL_SOFTSTROBE	0x08
-
-/* Hardware triggered strobe.  Like software triggered strobe, but
-   only starts the counter when the gate pin is set to high.  */
-#define PIT_CTRL_HARDSTROBE	0x0a
-
-/* Count mode.  */
-#define PIT_CTRL_COUNT_MASK	0x01
-#define PIT_CTRL_COUNT_BINARY	0x00	/* 16-bit binary counter.  */
-#define PIT_CTRL_COUNT_BCD	0x01	/* 4-decade BCD counter.  */
-
-#define T_REST			((grub_uint16_t) 0)
-#define T_FINE			((grub_uint16_t) -1)
-
-struct note
-{
-  grub_uint16_t pitch;
-  grub_uint16_t duration;
-};
-
-static void
-beep_off (void)
-{
-  unsigned char status;
-
-  status = grub_inb (SPEAKER);
-  grub_outb (status & ~(SPEAKER_TMR2 | SPEAKER_DATA), SPEAKER);
-}
-
-static void
-beep_on (grub_uint16_t pitch)
-{
-  unsigned char status;
-  unsigned int counter;
-
-  if (pitch < 20)
-    pitch = 20;
-  else if (pitch > 20000)
-    pitch = 20000;
-
-  counter = PIT_FREQUENCY / pitch;
-
-  /* Program timer 2.  */
-  grub_outb (PIT_CTRL_SELECT_2 | PIT_CTRL_READLOAD_WORD
-	| PIT_CTRL_SQUAREWAVE_GEN | PIT_CTRL_COUNT_BINARY, PIT_CTRL);
-  grub_outb (counter & 0xff, PIT_COUNTER_2);		/* LSB */
-  grub_outb ((counter >> 8) & 0xff, PIT_COUNTER_2);	/* MSB */
-
-  /* Start speaker.  */
-  status = grub_inb (SPEAKER);
-  grub_outb (status | SPEAKER_TMR2 | SPEAKER_DATA, SPEAKER);
-}
-
-/* Returns whether playing should continue.  */
-static int
-play (unsigned tempo, struct note *note)
-{
-  unsigned int to;
-
-  if (note->pitch == T_FINE || grub_checkkey () >= 0)
-    return 1;
-
-  grub_dprintf ("play", "pitch = %d, duration = %d\n", note->pitch,
-                note->duration);
-
-  switch (note->pitch)
-    {
-      case T_REST:
-        beep_off ();
-        break;
-
-      default:
-        beep_on (note->pitch);
-        break;
-    }
-
-  to = grub_get_rtc () + BASE_TEMPO * note->duration / tempo;
-  while (((unsigned int) grub_get_rtc () <= to) && (grub_checkkey () < 0))
-    ;
-
-  return 0;
-}
-
-static grub_err_t
-grub_cmd_play (grub_command_t cmd __attribute__ ((unused)),
-	       int argc, char **args)
-{
-  grub_file_t file;
-
-  if (argc < 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name or tempo and notes required");
-
-  file = grub_file_open (args[0]);
-  if (file)
-    {
-      struct note buf;
-      grub_uint32_t tempo;
-
-      if (grub_file_read (file, &tempo, sizeof (tempo)) != sizeof (tempo))
-        {
-          grub_file_close (file);
-          return grub_error (GRUB_ERR_FILE_READ_ERROR,
-                             "file doesn't even contains a full tempo record");
-        }
-
-      tempo = grub_le_to_cpu32 (tempo);
-      grub_dprintf ("play","tempo = %d\n", tempo);
-
-      while (grub_file_read (file, &buf,
-                             sizeof (struct note)) == sizeof (struct note))
-        {
-          buf.pitch = grub_le_to_cpu16 (buf.pitch);
-          buf.duration = grub_le_to_cpu16 (buf.duration);
-
-          if (play (tempo, &buf))
-            break;
-        }
-
-      grub_file_close (file);
-    }
-  else
-    {
-      char *end;
-      unsigned tempo;
-      struct note note;
-      int i;
-
-      tempo = grub_strtoul (args[0], &end, 0);
-
-      if (*end)
-        /* Was not a number either, assume it was supposed to be a file name.  */
-        return grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
-
-      grub_dprintf ("play","tempo = %d\n", tempo);
-
-      for (i = 1; i + 1 < argc; i += 2)
-        {
-          note.pitch = grub_strtoul (args[i], &end, 0);
-          if (*end)
-            {
-              grub_error (GRUB_ERR_BAD_NUMBER, "bogus pitch number");
-              break;
-            }
-
-          note.duration = grub_strtoul (args[i + 1], &end, 0);
-          if (*end)
-            {
-              grub_error (GRUB_ERR_BAD_NUMBER, "bogus duration number");
-              break;
-            }
-
-          if (play (tempo, &note))
-            break;
-        }
-    }
-
-  beep_off ();
-
-  while (grub_checkkey () > 0)
-    grub_getkey ();
-
-  return 0;
-}
-
-static grub_command_t cmd;
-
-GRUB_MOD_INIT(play)
-{
-  cmd = grub_register_command ("play", grub_cmd_play,
-			       N_("FILE | TEMPO [PITCH1 DURATION1] [PITCH2 DURATION2] ... "),
-			       N_("Play a tune."));
-}
-
-GRUB_MOD_FINI(play)
-{
-  grub_unregister_command (cmd);
-}

commands/i386/pc/vbeinfo.c

@@ -1,185 +0,0 @@
-/* vbeinfo.c - command to list compatible VBE video modes.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007,2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/env.h>
-#include <grub/misc.h>
-#include <grub/machine/init.h>
-#include <grub/machine/vbe.h>
-#include <grub/mm.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-
-static void *
-real2pm (grub_vbe_farptr_t ptr)
-{
-  return (void *) ((((unsigned long) ptr & 0xFFFF0000) >> 12UL)
-		   + ((unsigned long) ptr & 0x0000FFFF));
-}
-
-static grub_err_t
-grub_cmd_vbeinfo (grub_command_t cmd __attribute__ ((unused)),
-		  int argc __attribute__ ((unused)),
-		  char **args __attribute__ ((unused)))
-{
-  struct grub_vbe_info_block controller_info;
-  struct grub_vbe_mode_info_block mode_info_tmp;
-  grub_uint32_t use_mode = GRUB_VBE_DEFAULT_VIDEO_MODE;
-  grub_uint16_t *video_mode_list;
-  grub_uint16_t *p;
-  grub_uint16_t *saved_video_mode_list;
-  grub_size_t video_mode_list_size;
-  grub_err_t err;
-  char *modevar;
-
-  err = grub_vbe_probe (&controller_info);
-  if (err != GRUB_ERR_NONE)
-    return err;
-
-  grub_printf ("VBE info:   version: %d.%d  OEM software rev: %d.%d\n",
-	       controller_info.version >> 8,
-               controller_info.version & 0xFF,
-               controller_info.oem_software_rev >> 8,
-               controller_info.oem_software_rev & 0xFF);
-
-  /* The total_memory field is in 64 KiB units.  */
-  grub_printf ("            total memory: %d KiB\n",
-               (controller_info.total_memory << 16) / 1024);
-
-  /* Because the information on video modes is stored in a temporary place,
-     it is better to copy it to somewhere safe.  */
-  p = video_mode_list = real2pm (controller_info.video_mode_ptr);
-  while (*p++ != 0xFFFF)
-    ;
-
-  video_mode_list_size = (grub_addr_t) p - (grub_addr_t) video_mode_list;
-  saved_video_mode_list = grub_malloc (video_mode_list_size);
-  if (! saved_video_mode_list)
-    return grub_errno;
-
-  grub_memcpy (saved_video_mode_list, video_mode_list, video_mode_list_size);
-
-  grub_printf ("List of compatible video modes:\n");
-  grub_printf ("Legend: P=Packed pixel, D=Direct color, "
-	       "mask/pos=R/G/B/reserved\n");
-
-  /* Walk through all video modes listed.  */
-  for (p = saved_video_mode_list; *p != 0xFFFF; p++)
-    {
-      const char *memory_model = 0;
-      grub_uint32_t mode = (grub_uint32_t) *p;
-
-      err = grub_vbe_get_video_mode_info (mode, &mode_info_tmp);
-      if (err != GRUB_ERR_NONE)
-	{
-	  grub_errno = GRUB_ERR_NONE;
-	  continue;
-	}
-
-      if ((mode_info_tmp.mode_attributes & GRUB_VBE_MODEATTR_SUPPORTED) == 0)
-	/* If not available, skip it.  */
-	continue;
-
-      if ((mode_info_tmp.mode_attributes & GRUB_VBE_MODEATTR_RESERVED_1) == 0)
-	/* Not enough information.  */
-	continue;
-
-      if ((mode_info_tmp.mode_attributes & GRUB_VBE_MODEATTR_COLOR) == 0)
-	/* Monochrome is unusable.  */
-	continue;
-
-      if ((mode_info_tmp.mode_attributes & GRUB_VBE_MODEATTR_LFB_AVAIL) == 0)
-	/* We support only linear frame buffer modes.  */
-	continue;
-
-      if ((mode_info_tmp.mode_attributes & GRUB_VBE_MODEATTR_GRAPHICS) == 0)
-	/* We allow only graphical modes.  */
-	continue;
-
-      switch (mode_info_tmp.memory_model)
-	{
-	case GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL:
-	  memory_model = "Packed";
-	  break;
-	case GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR:
-	  memory_model = "Direct";
-	  break;
-
-	default:
-	  break;
-	}
-
-      if (! memory_model)
-	continue;
-
-      grub_printf ("0x%03x:  %4d x %4d x %2d  %s",
-                   mode,
-                   mode_info_tmp.x_resolution,
-                   mode_info_tmp.y_resolution,
-                   mode_info_tmp.bits_per_pixel,
-                   memory_model);
-
-      /* Show mask and position details for direct color modes.  */
-      if (mode_info_tmp.memory_model == GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR)
-        grub_printf (", mask: %d/%d/%d/%d  pos: %d/%d/%d/%d",
-                     mode_info_tmp.red_mask_size,
-                     mode_info_tmp.green_mask_size,
-                     mode_info_tmp.blue_mask_size,
-                     mode_info_tmp.rsvd_mask_size,
-                     mode_info_tmp.red_field_position,
-                     mode_info_tmp.green_field_position,
-                     mode_info_tmp.blue_field_position,
-                     mode_info_tmp.rsvd_field_position);
-      grub_printf ("\n");
-    }
-
-  grub_free (saved_video_mode_list);
-
-  /* Check existence of vbe_mode environment variable.  */
-  modevar = grub_env_get ("vbe_mode");
-
-  if (modevar != 0)
-    {
-      unsigned long value;
-
-      value = grub_strtoul (modevar, 0, 0);
-      if (grub_errno == GRUB_ERR_NONE)
-	use_mode = value;
-      else
-	grub_errno = GRUB_ERR_NONE;
-    }
-
-  grub_printf ("Configured VBE mode (vbe_mode) = 0x%03x\n", use_mode);
-
-  return 0;
-}
-
-static grub_command_t cmd;
-
-GRUB_MOD_INIT(vbeinfo)
-{
-  cmd =
-    grub_register_command ("vbeinfo", grub_cmd_vbeinfo, 0,
-			   N_("List compatible VESA BIOS extension video modes."));
-}
-
-GRUB_MOD_FINI(vbeinfo)
-{
-  grub_unregister_command (cmd);
-}

commands/i386/pc/vbetest.c

@@ -1,179 +0,0 @@
-/* vbetest.c - command to test VESA BIOS Extension 2.0+ support.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/normal.h>
-#include <grub/dl.h>
-#include <grub/env.h>
-#include <grub/misc.h>
-#include <grub/term.h>
-#include <grub/machine/init.h>
-#include <grub/machine/vbe.h>
-#include <grub/video.h>
-#include <grub/err.h>
-#include <grub/i18n.h>
-
-static grub_err_t
-grub_cmd_vbetest (grub_command_t cmd __attribute__ ((unused)),
-		  int argc __attribute__ ((unused)),
-		  char **args __attribute__ ((unused)))
-{
-  grub_err_t err;
-  char *modevar;
-  struct grub_vbe_mode_info_block mode_info;
-  struct grub_vbe_info_block controller_info;
-  grub_uint32_t use_mode = GRUB_VBE_DEFAULT_VIDEO_MODE;
-  grub_uint32_t old_mode;
-  grub_uint8_t *framebuffer = 0;
-  grub_uint32_t bytes_per_scan_line = 0;
-  unsigned char *ptr;
-  int i;
-
-  grub_printf ("Probing for VESA BIOS Extension ... ");
-
-  /* Check if VESA BIOS exists.  */
-  err = grub_vbe_probe (&controller_info);
-  if (err != GRUB_ERR_NONE)
-    return err;
-
-  grub_printf ("found!\n");
-
-  /* Dump out controller information.  */
-  grub_printf ("VBE signature = %c%c%c%c\n",
-	       controller_info.signature[0],
-	       controller_info.signature[1],
-	       controller_info.signature[2],
-	       controller_info.signature[3]);
-
-  grub_printf ("VBE version = %d.%d\n",
-	       controller_info.version >> 8,
-	       controller_info.version & 0xFF);
-  grub_printf ("OEM string ptr = %08x\n",
-	       controller_info.oem_string_ptr);
-  grub_printf ("Total memory = %d\n",
-	       controller_info.total_memory);
-
-  err = grub_vbe_get_video_mode (&old_mode);
-  grub_printf ("Get video mode err = %04x\n", err);
-
-  if (err == GRUB_ERR_NONE)
-    grub_printf ("Old video mode = %04x\n", old_mode);
-  else
-    grub_errno = GRUB_ERR_NONE;
-
-  /* Check existence of vbe_mode environment variable.  */
-  modevar = grub_env_get ("vbe_mode");
-  if (modevar != 0)
-    {
-      unsigned long value;
-
-      value = grub_strtoul (modevar, 0, 0);
-      if (grub_errno == GRUB_ERR_NONE)
-	use_mode = value;
-      else
-	grub_errno = GRUB_ERR_NONE;
-    }
-
-  err = grub_vbe_get_video_mode_info (use_mode, &mode_info);
-  if (err != GRUB_ERR_NONE)
-    return err;
-
-  /* Dump out details about the mode being tested.  */
-  grub_printf ("mode: 0x%03x\n",
-               use_mode);
-  grub_printf ("width : %d\n",
-               mode_info.x_resolution);
-  grub_printf ("height: %d\n",
-               mode_info.y_resolution);
-  grub_printf ("memory model: %02x\n",
-               mode_info.memory_model);
-  grub_printf ("bytes/scanline: %d\n",
-               mode_info.bytes_per_scan_line);
-  grub_printf ("bytes/scanline (lin): %d\n",
-               mode_info.lin_bytes_per_scan_line);
-  grub_printf ("base address: %08x\n",
-               mode_info.phys_base_addr);
-  grub_printf ("red mask/pos: %d/%d\n",
-               mode_info.red_mask_size,
-               mode_info.red_field_position);
-  grub_printf ("green mask/pos: %d/%d\n",
-               mode_info.green_mask_size,
-               mode_info.green_field_position);
-  grub_printf ("blue mask/pos: %d/%d\n",
-               mode_info.blue_mask_size,
-               mode_info.blue_field_position);
-
-  grub_printf ("Press any key to continue.\n");
-
-  grub_getkey ();
-
-  /* Setup GFX mode.  */
-  err = grub_vbe_set_video_mode (use_mode, &mode_info);
-  if (err != GRUB_ERR_NONE)
-    return err;
-
-  /* Determine framebuffer address and how many bytes are in scan line.  */
-  framebuffer = (grub_uint8_t *) mode_info.phys_base_addr;
-  ptr = framebuffer;
-
-  if (controller_info.version >= 0x300)
-    {
-      bytes_per_scan_line = mode_info.lin_bytes_per_scan_line;
-    }
-  else
-    {
-      bytes_per_scan_line = mode_info.bytes_per_scan_line;
-    }
-
-  /* Draw some random data to screen.  */
-  for (i = 0; i < 256 * 256; i++)
-    {
-      ptr[i] = i & 0x0F;
-    }
-
-  /* Draw white line to screen.  */
-  for (i = 0; i < 100; i++)
-    {
-      ptr[mode_info.bytes_per_scan_line * 50 + i] = 0x0F;
-    }
-
-  /* Draw another white line to screen.  */
-  grub_memset (ptr + bytes_per_scan_line * 51, 0x0f, bytes_per_scan_line);
-
-  grub_getkey ();
-
-  grub_video_restore ();
-
-  /* Restore old video mode.  */
-  grub_vbe_set_video_mode (old_mode, 0);
-
-  return grub_errno;
-}
-
-static grub_command_t cmd;
-
-GRUB_MOD_INIT(vbetest)
-{
-  cmd = grub_register_command ("vbetest", grub_cmd_vbetest,
-			       0, N_("Test VESA BIOS Extension 2.0+ support."));
-}
-
-GRUB_MOD_FINI(vbetest)
-{
-  grub_unregister_command (cmd);
-}

commands/minicmd.c

@@ -1,391 +0,0 @@
-/* minicmd.c - commands for the rescue mode */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2005,2006,2007,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/mm.h>
-#include <grub/err.h>
-#include <grub/env.h>
-#include <grub/misc.h>
-#include <grub/file.h>
-#include <grub/disk.h>
-#include <grub/term.h>
-#include <grub/loader.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-
-/* cat FILE */
-static grub_err_t
-grub_mini_cmd_cat (struct grub_command *cmd __attribute__ ((unused)),
-		   int argc, char *argv[])
-{
-  grub_file_t file;
-  char buf[GRUB_DISK_SECTOR_SIZE];
-  grub_ssize_t size;
-
-  if (argc < 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
-
-  file = grub_file_open (argv[0]);
-  if (! file)
-    return grub_errno;
-
-  while ((size = grub_file_read (file, buf, sizeof (buf))) > 0)
-    {
-      int i;
-
-      for (i = 0; i < size; i++)
-	{
-	  unsigned char c = buf[i];
-
-	  if ((grub_isprint (c) || grub_isspace (c)) && c != '\r')
-	    grub_putchar (c);
-	  else
-	    {
-	      grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
-	      grub_printf ("<%x>", (int) c);
-	      grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
-	    }
-	}
-    }
-
-  grub_putchar ('\n');
-  grub_refresh ();
-  grub_file_close (file);
-
-  return 0;
-}
-
-/* help */
-static grub_err_t
-grub_mini_cmd_help (struct grub_command *cmd __attribute__ ((unused)),
-		    int argc __attribute__ ((unused)),
-		    char *argv[] __attribute__ ((unused)))
-{
-  grub_command_t p;
-
-  for (p = grub_command_list; p; p = p->next)
-    grub_printf ("%s (%d%c)\t%s\n", p->name,
-		 p->prio & GRUB_PRIO_LIST_PRIO_MASK,
-		 (p->prio & GRUB_PRIO_LIST_FLAG_ACTIVE) ? '+' : '-',
-		 p->description);
-
-  return 0;
-}
-
-#if 0
-static void
-grub_rescue_cmd_info (void)
-{
-  extern void grub_disk_cache_get_performance (unsigned long *,
-					       unsigned long *);
-  unsigned long hits, misses;
-
-  grub_disk_cache_get_performance (&hits, &misses);
-  grub_printf ("Disk cache: hits = %u, misses = %u ", hits, misses);
-  if (hits + misses)
-    {
-      unsigned long ratio = hits * 10000 / (hits + misses);
-      grub_printf ("(%u.%u%%)\n", ratio / 100, ratio % 100);
-    }
-  else
-    grub_printf ("(N/A)\n");
-}
-#endif
-
-/* root [DEVICE] */
-static grub_err_t
-grub_mini_cmd_root (struct grub_command *cmd __attribute__ ((unused)),
-		    int argc, char *argv[])
-{
-  grub_device_t dev;
-  grub_fs_t fs;
-
-  if (argc > 0)
-    {
-      char *device_name = grub_file_get_device_name (argv[0]);
-      if (! device_name)
-	return grub_errno;
-
-      grub_env_set ("root", device_name);
-      grub_free (device_name);
-    }
-
-  dev = grub_device_open (0);
-  if (! dev)
-    return grub_errno;
-
-  fs = grub_fs_probe (dev);
-  if (grub_errno == GRUB_ERR_UNKNOWN_FS)
-    grub_errno = GRUB_ERR_NONE;
-
-  grub_printf ("(%s): Filesystem is %s.\n",
-	       grub_env_get ("root"), fs ? fs->name : "unknown");
-
-  grub_device_close (dev);
-
-  return 0;
-}
-
-#if 0
-static void
-grub_rescue_cmd_testload (int argc, char *argv[])
-{
-  grub_file_t file;
-  char *buf;
-  grub_ssize_t size;
-  grub_ssize_t pos;
-  auto void read_func (unsigned long sector, unsigned offset, unsigned len);
-
-  void read_func (unsigned long sector __attribute__ ((unused)),
-		  unsigned offset __attribute__ ((unused)),
-		  unsigned len __attribute__ ((unused)))
-    {
-      grub_putchar ('.');
-      grub_refresh ();
-    }
-
-  if (argc < 1)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
-      return;
-    }
-
-  file = grub_file_open (argv[0]);
-  if (! file)
-    return;
-
-  size = grub_file_size (file) & ~(GRUB_DISK_SECTOR_SIZE - 1);
-  if (size == 0)
-    {
-      grub_file_close (file);
-      return;
-    }
-
-  buf = grub_malloc (size);
-  if (! buf)
-    goto fail;
-
-  grub_printf ("Reading %s sequentially", argv[0]);
-  file->read_hook = read_func;
-  if (grub_file_read (file, buf, size) != size)
-    goto fail;
-  grub_printf (" Done.\n");
-
-  /* Read sequentially again.  */
-  grub_printf ("Reading %s sequentially again", argv[0]);
-  if (grub_file_seek (file, 0) < 0)
-    goto fail;
-
-  for (pos = 0; pos < size; pos += GRUB_DISK_SECTOR_SIZE)
-    {
-      char sector[GRUB_DISK_SECTOR_SIZE];
-
-      if (grub_file_read (file, sector, GRUB_DISK_SECTOR_SIZE)
-	  != GRUB_DISK_SECTOR_SIZE)
-	goto fail;
-
-      if (grub_memcmp (sector, buf + pos, GRUB_DISK_SECTOR_SIZE) != 0)
-	{
-	  grub_printf ("\nDiffers in %d\n", pos);
-	  goto fail;
-	}
-    }
-  grub_printf (" Done.\n");
-
-  /* Read backwards and compare.  */
-  grub_printf ("Reading %s backwards", argv[0]);
-  pos = size;
-  while (pos > 0)
-    {
-      char sector[GRUB_DISK_SECTOR_SIZE];
-
-      pos -= GRUB_DISK_SECTOR_SIZE;
-
-      if (grub_file_seek (file, pos) < 0)
-	goto fail;
-
-      if (grub_file_read (file, sector, GRUB_DISK_SECTOR_SIZE)
-	  != GRUB_DISK_SECTOR_SIZE)
-	goto fail;
-
-      if (grub_memcmp (sector, buf + pos, GRUB_DISK_SECTOR_SIZE) != 0)
-	{
-	  int i;
-
-	  grub_printf ("\nDiffers in %d\n", pos);
-
-	  for (i = 0; i < GRUB_DISK_SECTOR_SIZE; i++)
-	    grub_putchar (buf[pos + i]);
-
-	  if (i)
-	    grub_refresh ();
-
-	  goto fail;
-	}
-    }
-  grub_printf (" Done.\n");
-
- fail:
-
-  grub_file_close (file);
-  grub_free (buf);
-}
-#endif
-
-/* dump ADDRESS [SIZE] */
-static grub_err_t
-grub_mini_cmd_dump (struct grub_command *cmd __attribute__ ((unused)),
-		    int argc, char *argv[])
-{
-  grub_uint8_t *addr;
-  grub_size_t size = 4;
-
-  if (argc == 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no address specified");
-
-  addr = (grub_uint8_t *) grub_strtoul (argv[0], 0, 0);
-  if (grub_errno)
-    return grub_errno;
-
-  if (argc > 1)
-    size = (grub_size_t) grub_strtoul (argv[1], 0, 0);
-
-  while (size--)
-    {
-      grub_printf ("%x%x ", *addr >> 4, *addr & 0xf);
-      addr++;
-    }
-
-  return 0;
-}
-
-/* rmmod MODULE */
-static grub_err_t
-grub_mini_cmd_rmmod (struct grub_command *cmd __attribute__ ((unused)),
-		     int argc, char *argv[])
-{
-  grub_dl_t mod;
-
-  if (argc == 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no module specified");
-
-  mod = grub_dl_get (argv[0]);
-  if (! mod)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no such module");
-
-  if (grub_dl_unref (mod) <= 0)
-    grub_dl_unload (mod);
-
-  return 0;
-}
-
-/* lsmod */
-static grub_err_t
-grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
-		     int argc __attribute__ ((unused)),
-		     char *argv[] __attribute__ ((unused)))
-{
-  auto int print_module (grub_dl_t mod);
-
-  int print_module (grub_dl_t mod)
-    {
-      grub_dl_dep_t dep;
-
-      grub_printf ("%s\t%d\t\t", mod->name, mod->ref_count);
-      for (dep = mod->dep; dep; dep = dep->next)
-	{
-	  if (dep != mod->dep)
-	    grub_putchar (',');
-
-	  grub_printf ("%s", dep->mod->name);
-	}
-      grub_putchar ('\n');
-
-      return 0;
-    }
-
-  grub_printf ("Name\tRef Count\tDependencies\n");
-  grub_dl_iterate (print_module);
-
-  return 0;
-}
-
-/* exit */
-static grub_err_t
-grub_mini_cmd_exit (struct grub_command *cmd __attribute__ ((unused)),
-		    int argc __attribute__ ((unused)),
-		    char *argv[] __attribute__ ((unused)))
-{
-  grub_exit ();
-  return 0;
-}
-
-/* clear */
-static grub_err_t
-grub_mini_cmd_clear (struct grub_command *cmd __attribute__ ((unused)),
-		   int argc __attribute__ ((unused)),
-		   char *argv[] __attribute__ ((unused)))
-{
-  grub_cls ();
-  return 0;
-}
-
-static grub_command_t cmd_cat, cmd_help, cmd_root;
-static grub_command_t cmd_dump, cmd_rmmod, cmd_lsmod, cmd_exit;
-static grub_command_t cmd_clear;
-
-GRUB_MOD_INIT(minicmd)
-{
-  cmd_cat =
-    grub_register_command ("cat", grub_mini_cmd_cat,
-			   N_("FILE"), N_("Show the contents of a file."));
-  cmd_help =
-    grub_register_command ("help", grub_mini_cmd_help,
-			   0, N_("Show this message."));
-  cmd_root =
-    grub_register_command ("root", grub_mini_cmd_root,
-			   N_("[DEVICE]"), N_("Set the root device."));
-  cmd_dump =
-    grub_register_command ("dump", grub_mini_cmd_dump,
-			   N_("ADDR"), N_("Dump memory."));
-  cmd_rmmod =
-    grub_register_command ("rmmod", grub_mini_cmd_rmmod,
-			   N_("MODULE"), N_("Remove a module."));
-  cmd_lsmod =
-    grub_register_command ("lsmod", grub_mini_cmd_lsmod,
-			   0, N_("Show loaded modules."));
-  cmd_exit =
-    grub_register_command ("exit", grub_mini_cmd_exit,
-			   0, N_("Exit from GRUB."));
-  cmd_clear =
-    grub_register_command ("clear", grub_mini_cmd_clear,
-			   0, N_("Clear the screen."));
-}
-
-GRUB_MOD_FINI(minicmd)
-{
-  grub_unregister_command (cmd_cat);
-  grub_unregister_command (cmd_help);
-  grub_unregister_command (cmd_root);
-  grub_unregister_command (cmd_dump);
-  grub_unregister_command (cmd_rmmod);
-  grub_unregister_command (cmd_lsmod);
-  grub_unregister_command (cmd_exit);
-  grub_unregister_command (cmd_clear);
-}

commands/search.c

@@ -1,174 +0,0 @@
-/* search.c - search devices based on a file or a filesystem label */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007,2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/types.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-#include <grub/err.h>
-#include <grub/dl.h>
-#include <grub/device.h>
-#include <grub/file.h>
-#include <grub/env.h>
-#include <grub/command.h>
-#include <grub/search.h>
-#include <grub/i18n.h>
-
-void
-FUNC_NAME (const char *key, const char *var, int no_floppy)
-{
-  int count = 0;
-  grub_fs_autoload_hook_t saved_autoload;
-
-  auto int iterate_device (const char *name);
-  int iterate_device (const char *name)
-  {
-    int found = 0;
-
-    /* Skip floppy drives when requested.  */
-    if (no_floppy &&
-	name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9')
-      return 0;
-
-#ifdef DO_SEARCH_FILE
-      {
-	char *buf;
-	grub_file_t file;
-
-	buf = grub_xasprintf ("(%s)%s", name, key);
-	if (! buf)
-	  return 1;
-
-	file = grub_file_open (buf);
-	if (file)
-	  {
-	    found = 1;
-	    grub_file_close (file);
-	  }
-	grub_free (buf);
-      }
-#else
-      {
-	/* SEARCH_FS_UUID or SEARCH_LABEL */
-	grub_device_t dev;
-	grub_fs_t fs;
-	char *quid;
-
-	dev = grub_device_open (name);
-	if (dev)
-	  {
-	    fs = grub_fs_probe (dev);
-
-#ifdef DO_SEARCH_FS_UUID
-#define compare_fn grub_strcasecmp
-#define read_fn uuid
-#else
-#define compare_fn grub_strcmp
-#define read_fn label
-#endif
-
-	    if (fs && fs->read_fn)
-	      {
-		fs->read_fn (dev, &quid);
-
-		if (grub_errno == GRUB_ERR_NONE && quid)
-		  {
-		    if (compare_fn (quid, key) == 0)
-		      found = 1;
-
-		    grub_free (quid);
-		  }
-	      }
-
-	    grub_device_close (dev);
-	  }
-      }
-#endif
-
-    if (found)
-      {
-	count++;
-	if (var)
-	  grub_env_set (var, name);
-	else
-	  grub_printf (" %s", name);
-      }
-
-    grub_errno = GRUB_ERR_NONE;
-    return (found && var);
-  }
-
-  /* First try without autoloading if we're setting variable. */
-  if (var)
-    {
-      saved_autoload = grub_fs_autoload_hook;
-      grub_fs_autoload_hook = 0;
-      grub_device_iterate (iterate_device);
-
-      /* Restore autoload hook.  */
-      grub_fs_autoload_hook = saved_autoload;
-
-      /* Retry with autoload if nothing found.  */
-      if (grub_errno == GRUB_ERR_NONE && count == 0)
-	grub_device_iterate (iterate_device);
-    }
-  else
-    grub_device_iterate (iterate_device);
-
-  if (grub_errno == GRUB_ERR_NONE && count == 0)
-    grub_error (GRUB_ERR_FILE_NOT_FOUND, "no such device: %s", key);
-}
-
-static grub_err_t
-grub_cmd_do_search (grub_command_t cmd __attribute__ ((unused)), int argc,
-		    char **args)
-{
-  if (argc == 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no argument specified");
-
-  FUNC_NAME (args[0], argc == 1 ? 0 : args[1], 0);
-
-  return grub_errno;
-}
-
-static grub_command_t cmd;
-
-#ifdef DO_SEARCH_FILE
-GRUB_MOD_INIT(search_file)
-#elif defined (DO_SEARCH_FS_UUID)
-GRUB_MOD_INIT(search_fs_uuid)
-#else
-GRUB_MOD_INIT(search_fs_label)
-#endif
-{
-  cmd =
-    grub_register_command (COMMAND_NAME, grub_cmd_do_search,
-			   N_("NAME [VARIABLE]"),
-			   HELP_MESSAGE);
-}
-
-#ifdef DO_SEARCH_FILE
-GRUB_MOD_FINI(search_file)
-#elif defined (DO_SEARCH_FS_UUID)
-GRUB_MOD_FINI(search_fs_uuid)
-#else
-GRUB_MOD_FINI(search_fs_label)
-#endif
-{
-  grub_unregister_command (cmd);
-}

commands/search_wrap.c

@@ -1,95 +0,0 @@
-/* search.c - search devices based on a file or a filesystem label */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007,2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/types.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-#include <grub/err.h>
-#include <grub/dl.h>
-#include <grub/env.h>
-#include <grub/extcmd.h>
-#include <grub/search.h>
-#include <grub/i18n.h>
-
-static const struct grub_arg_option options[] =
-  {
-    {"file",		'f', 0, N_("Search devices by a file."), 0, 0},
-    {"label",		'l', 0, N_("Search devices by a filesystem label."),
-     0, 0},
-    {"fs-uuid",		'u', 0, N_("Search devices by a filesystem UUID."),
-     0, 0},
-    {"set",		's', GRUB_ARG_OPTION_OPTIONAL,
-     N_("Set a variable to the first device found."), "VAR", ARG_TYPE_STRING},
-    {"no-floppy",	'n', 0, N_("Do not probe any floppy drive."), 0, 0},
-    {0, 0, 0, 0, 0, 0}
-  };
-
-enum options
-  {
-    SEARCH_FILE,
-    SEARCH_LABEL,
-    SEARCH_FS_UUID,
-    SEARCH_SET,
-    SEARCH_NO_FLOPPY,
- };
-
-static grub_err_t
-grub_cmd_search (grub_extcmd_t cmd, int argc, char **args)
-{
-  struct grub_arg_list *state = cmd->state;
-  const char *var = 0;
-
-  if (argc == 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no argument specified");
-
-  if (state[SEARCH_SET].set)
-    var = state[SEARCH_SET].arg ? state[SEARCH_SET].arg : "root";
-
-  if (state[SEARCH_LABEL].set)
-    grub_search_label (args[0], var, state[SEARCH_NO_FLOPPY].set);
-  else if (state[SEARCH_FS_UUID].set)
-    grub_search_fs_uuid (args[0], var, state[SEARCH_NO_FLOPPY].set);
-  else if (state[SEARCH_FILE].set)
-    grub_search_fs_file (args[0], var, state[SEARCH_NO_FLOPPY].set);
-  else
-    return grub_error (GRUB_ERR_INVALID_COMMAND, "unspecified search type");
-
-  return grub_errno;
-}
-
-static grub_extcmd_t cmd;
-
-GRUB_MOD_INIT(search)
-{
-  cmd =
-    grub_register_extcmd ("search", grub_cmd_search,
-			  GRUB_COMMAND_FLAG_BOTH,
-			  N_("search [-f|-l|-u|-s|-n] NAME"),
-			  N_("Search devices by file, filesystem label"
-			     " or filesystem UUID."
-			     " If --set is specified, the first device found is"
-			     " set to a variable. If no variable name is"
-			     " specified, \"root\" is used."),
-			  options);
-}
-
-GRUB_MOD_FINI(search)
-{
-  grub_unregister_extcmd (cmd);
-}

commands/terminal.c

@@ -1,368 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009,2010  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/mm.h>
-#include <grub/dl.h>
-#include <grub/command.h>
-#include <grub/term.h>
-#include <grub/i18n.h>
-#include <grub/misc.h>
-
-struct grub_term_autoload *grub_term_input_autoload = NULL;
-struct grub_term_autoload *grub_term_output_autoload = NULL;
-
-static grub_err_t
-grub_cmd_terminal_input (grub_command_t cmd __attribute__ ((unused)),
-			 int argc, char **args)
-{
-  int i;
-  grub_term_input_t term;
-  struct grub_term_autoload *aut;
-
-  if (argc == 0)
-    {
-      grub_puts_ (N_ ("Active input terminals:"));
-      FOR_ACTIVE_TERM_INPUTS(term)
-	grub_printf ("%s ", term->name);
-      grub_printf ("\n");
-      grub_puts_ (N_ ("Available input terminals:"));
-      FOR_DISABLED_TERM_INPUTS(term)
-	grub_printf ("%s ", term->name);
-      /* This is quadratic but we don't expect mode than 30 terminal
-	 modules ever.  */
-      for (aut = grub_term_input_autoload; aut; aut = aut->next)
-	{
-	  FOR_DISABLED_TERM_INPUTS(term)
-	    if (grub_strcmp (term->name, aut->name) == 0)
-	      break;
-	  if (!term)
-	    FOR_ACTIVE_TERM_INPUTS(term)
-	      if (grub_strcmp (term->name, aut->name) == 0)
-		break;
-	  if (!term)
-	    grub_printf ("%s ", aut->name);
-	}
-      grub_printf ("\n");
-      return GRUB_ERR_NONE;
-    }
-  i = 0;
-
-  if (grub_strcmp (args[0], "--append") == 0
-      || grub_strcmp (args[0], "--remove") == 0)
-    i++;
-
-  if (i == argc)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_ ("no terminal specified"));
-
-  for (; i < argc; i++)
-    {
-      int again = 0;
-      while (1)
-	{
-	  FOR_DISABLED_TERM_INPUTS(term)
-	    if (grub_strcmp (args[i], term->name) == 0)
-	      break;
-	  if (term == 0)
-	    FOR_ACTIVE_TERM_INPUTS(term)
-	      if (grub_strcmp (args[i], term->name) == 0)
-		break;
-	  if (term)
-	    break;
-	  if (again)
-	    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n",
-			       args[i]);
-	  for (aut = grub_term_input_autoload; aut; aut = aut->next)
-	    if (grub_strcmp (args[i], aut->name) == 0)
-	      {
-		grub_dl_t mod;
-		mod = grub_dl_load (aut->modname);
-		if (mod)
-		  grub_dl_ref (mod);
-		grub_errno = GRUB_ERR_NONE;
-		break;
-	      }
-	  if (!aut)
-	    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n",
-			       args[i]);
-	  again = 1;
-	}
-    }
-
-  if (grub_strcmp (args[0], "--append") == 0)
-    {
-      for (i = 1; i < argc; i++)
-	{
-	  FOR_DISABLED_TERM_INPUTS(term)
-	    if (grub_strcmp (args[i], term->name) == 0)
-	      break;
-	  if (term)
-	    {
-              if (term->init && term->init () != GRUB_ERR_NONE)
-                return grub_errno;
-
-	      grub_list_remove (GRUB_AS_LIST_P (&(grub_term_inputs_disabled)),
-				GRUB_AS_LIST (term));
-	      grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs),
-			      GRUB_AS_LIST (term));
-	    }
-	}
-      return GRUB_ERR_NONE;
-    }
-
-  if (grub_strcmp (args[0], "--remove") == 0)
-    {
-      for (i = 1; i < argc; i++)
-	{
-	  FOR_ACTIVE_TERM_INPUTS(term)
-	    if (grub_strcmp (args[i], term->name) == 0)
-	      break;
-	  if (term)
-	    {
-	      if (!term->next && term == grub_term_inputs)
-		return grub_error (GRUB_ERR_BAD_ARGUMENT,
-				   "can't remove the last terminal");
-	      grub_list_remove (GRUB_AS_LIST_P (&(grub_term_inputs)),
-				GRUB_AS_LIST (term));
-	      if (term->fini)
-		term->fini ();
-	      grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs_disabled),
-			      GRUB_AS_LIST (term));
-	    }
-	}
-      return GRUB_ERR_NONE;
-    }
-  for (i = 0; i < argc; i++)
-    {
-      FOR_DISABLED_TERM_INPUTS(term)
-	if (grub_strcmp (args[i], term->name) == 0)
-	  break;
-      if (term)
-	{
-	  if (term->init && term->init () != GRUB_ERR_NONE)
-	    return grub_errno;
-
-	  grub_list_remove (GRUB_AS_LIST_P (&(grub_term_inputs_disabled)),
-			    GRUB_AS_LIST (term));
-	  grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs),
-			  GRUB_AS_LIST (term));
-	}	
-    }
-
-  FOR_ACTIVE_TERM_INPUTS(term)
-  {
-    for (i = 0; i < argc; i++)
-      if (grub_strcmp (args[i], term->name) == 0)
-	break;
-    if (i == argc)
-      {
-	if (!term->next && term == grub_term_inputs)
-	  return grub_error (GRUB_ERR_BAD_ARGUMENT,
-			     "can't remove the last terminal");
-	grub_list_remove (GRUB_AS_LIST_P (&(grub_term_inputs)),
-			  GRUB_AS_LIST (term));
-	if (term->fini)
-	  term->fini ();
-	grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs_disabled),
-			GRUB_AS_LIST (term));
-      }
-  }
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_cmd_terminal_output (grub_command_t cmd __attribute__ ((unused)),
-			 int argc, char **args)
-{
-  int i;
-  grub_term_output_t term;
-  struct grub_term_autoload *aut;
-
-  if (argc == 0)
-    {
-      grub_puts_ (N_ ("Active output terminals:"));
-      FOR_ACTIVE_TERM_OUTPUTS(term)
-	grub_printf ("%s ", term->name);
-      grub_printf ("\n");
-      grub_puts_ (N_ ("Available output terminals:"));
-      FOR_DISABLED_TERM_OUTPUTS(term)
-	grub_printf ("%s ", term->name);
-      /* This is quadratic but we don't expect mode than 30 terminal
-	 modules ever.  */
-      for (aut = grub_term_output_autoload; aut; aut = aut->next)
-	{
-	  FOR_DISABLED_TERM_OUTPUTS(term)
-	    if (grub_strcmp (term->name, aut->name) == 0)
-	      break;
-	  if (!term)
-	    FOR_ACTIVE_TERM_OUTPUTS(term)
-	      if (grub_strcmp (term->name, aut->name) == 0)
-		break;
-	  if (!term)
-	    grub_printf ("%s ", aut->name);
-	}
-      grub_printf ("\n");
-      return GRUB_ERR_NONE;
-    }
-  i = 0;
-
-  if (grub_strcmp (args[0], "--append") == 0
-      || grub_strcmp (args[0], "--remove") == 0)
-    i++;
-
-  if (i == argc)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_ ("no terminal specified"));
-
-  for (; i < argc; i++)
-    {
-      int again = 0;
-      while (1)
-	{
-	  FOR_DISABLED_TERM_OUTPUTS(term)
-	    if (grub_strcmp (args[i], term->name) == 0)
-	      break;
-	  if (term == 0)
-	    FOR_ACTIVE_TERM_OUTPUTS(term)
-	      if (grub_strcmp (args[i], term->name) == 0)
-		break;
-	  if (term)
-	    break;
-	  if (again)
-	    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n",
-			       args[i]);
-	  for (aut = grub_term_output_autoload; aut; aut = aut->next)
-	    if (grub_strcmp (args[i], aut->name) == 0)
-	      {
-		grub_dl_t mod;
-		mod = grub_dl_load (aut->modname);
-		if (mod)
-		  grub_dl_ref (mod);
-		grub_errno = GRUB_ERR_NONE;
-		break;
-	      }
-	  if (!aut)
-	    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n",
-			       args[i]);
-	  again = 1;
-	}
-    }
-
-  if (grub_strcmp (args[0], "--append") == 0)
-    {
-      for (i = 1; i < argc; i++)
-	{
-	  FOR_DISABLED_TERM_OUTPUTS(term)
-	    if (grub_strcmp (args[i], term->name) == 0)
-	      break;
-	  if (term)
-	    {
-              if (term->init && term->init () != GRUB_ERR_NONE)
-                return grub_errno;
-
-	      grub_list_remove (GRUB_AS_LIST_P (&(grub_term_outputs_disabled)),
-				GRUB_AS_LIST (term));
-	      grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs),
-			      GRUB_AS_LIST (term));
-	    }
-	}
-      return GRUB_ERR_NONE;
-    }
-
-  if (grub_strcmp (args[0], "--remove") == 0)
-    {
-      for (i = 1; i < argc; i++)
-	{
-	  FOR_ACTIVE_TERM_OUTPUTS(term)
-	    if (grub_strcmp (args[i], term->name) == 0)
-	      break;
-	  if (term)
-	    {
-	      if (!term->next && term == grub_term_outputs)
-		return grub_error (GRUB_ERR_BAD_ARGUMENT,
-				   "can't remove the last terminal");
-	      grub_list_remove (GRUB_AS_LIST_P (&(grub_term_outputs)),
-				GRUB_AS_LIST (term));
-	      if (term->fini)
-		term->fini ();
-	      grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs_disabled),
-			      GRUB_AS_LIST (term));
-	    }
-	}
-      return GRUB_ERR_NONE;
-    }
-
-  for (i = 0; i < argc; i++)
-    {
-      FOR_DISABLED_TERM_OUTPUTS(term)
-	if (grub_strcmp (args[i], term->name) == 0)
-	  break;
-      if (term)
-	{
-	  if (term->init && term->init () != GRUB_ERR_NONE)
-	    return grub_errno;
-
-	  grub_list_remove (GRUB_AS_LIST_P (&(grub_term_outputs_disabled)),
-			    GRUB_AS_LIST (term));
-	  grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs),
-			  GRUB_AS_LIST (term));
-	}	
-    }
-
-  FOR_ACTIVE_TERM_OUTPUTS(term)
-  {
-    for (i = 0; i < argc; i++)
-      if (grub_strcmp (args[i], term->name) == 0)
-	break;
-    if (i == argc)
-      {
-	if (!term->next && term == grub_term_outputs)
-	  return grub_error (GRUB_ERR_BAD_ARGUMENT,
-			     "can't remove the last terminal");
-	grub_list_remove (GRUB_AS_LIST_P (&(grub_term_outputs)),
-			  GRUB_AS_LIST (term));
-	if (term->fini)
-	  term->fini ();
-	grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs_disabled),
-			GRUB_AS_LIST (term));
-      }
-  }
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_command_t cmd_terminal_input, cmd_terminal_output;
-
-GRUB_MOD_INIT(terminal)
-{
-  cmd_terminal_input =
-    grub_register_command ("terminal_input", grub_cmd_terminal_input,
-			   "[--append|--remove] "
-			   "[TERMINAL1] [TERMINAL2] ...",
-			   "List or select an input terminal.");
-  cmd_terminal_output =
-    grub_register_command ("terminal_output", grub_cmd_terminal_output,
-			   "[--append|--remove] "
-			   "[TERMINAL1] [TERMINAL2] ...",
-			   "List or select an output terminal.");
-}
-
-GRUB_MOD_FINI(terminal)
-{
-  grub_unregister_command (cmd_terminal_input);
-  grub_unregister_command (cmd_terminal_output);
-}

commands/videotest.c

@@ -1,186 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/video.h>
-#include <grub/types.h>
-#include <grub/dl.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-#include <grub/font.h>
-#include <grub/term.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-
-static grub_err_t
-grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
-                    int argc __attribute__ ((unused)),
-                    char **args __attribute__ ((unused)))
-{
-  grub_err_t err;
-  grub_video_color_t color;
-  unsigned int x;
-  unsigned int y;
-  unsigned int width;
-  unsigned int height;
-  int i;
-  grub_font_t sansbig;
-  grub_font_t sans;
-  grub_font_t sanssmall;
-  grub_font_t fixed;
-  struct grub_font_glyph *glyph;
-  struct grub_video_render_target *text_layer;
-  grub_video_color_t palette[16];
-  const char *str;
-  int texty;
-
-  err = grub_video_set_mode ("auto", GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
-  if (err)
-    return err;
-
-  grub_video_get_viewport (&x, &y, &width, &height);
-
-  grub_video_create_render_target (&text_layer, width, height,
-                                   GRUB_VIDEO_MODE_TYPE_RGB
-                                   | GRUB_VIDEO_MODE_TYPE_ALPHA);
-
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
-
-  color = grub_video_map_rgb (0, 0, 0);
-  grub_video_fill_rect (color, 0, 0, width, height);
-
-  color = grub_video_map_rgb (255, 0, 0);
-  grub_video_fill_rect (color, 0, 0, 100, 100);
-
-  color = grub_video_map_rgb (0, 255, 255);
-  grub_video_fill_rect (color, 100, 100, 100, 100);
-
-  sansbig = grub_font_get ("Unknown Regular 16");
-  sans = grub_font_get ("Unknown Regular 16");
-  sanssmall = grub_font_get ("Unknown Regular 16");
-  fixed = grub_font_get ("Fixed 20");
-  if (! sansbig || ! sans || ! sanssmall || ! fixed)
-    return grub_error (GRUB_ERR_BAD_FONT, "no font loaded");
-
-  glyph = grub_font_get_glyph (fixed, '*');
-  grub_font_draw_glyph (glyph, color, 200 ,0);
-
-  grub_video_set_viewport (x + 150, y + 150,
-                           width - 150 * 2, height - 150 * 2);
-  color = grub_video_map_rgb (77, 33, 77);
-  grub_video_fill_rect (color, 0, 0, width, height);
-
-  grub_video_set_active_render_target (text_layer);
-
-  color = grub_video_map_rgb (255, 255, 255);
-
-  texty = 32;
-  grub_font_draw_string ("The quick brown fox jumped over the lazy dog.",
-                         sans, color, 16, texty);
-  texty += grub_font_get_descent (sans) + grub_font_get_leading (sans);
-
-  texty += grub_font_get_ascent (fixed);
-  grub_font_draw_string ("The quick brown fox jumped over the lazy dog.",
-                         fixed, color, 16, texty);
-  texty += grub_font_get_descent (fixed) + grub_font_get_leading (fixed);
-
-  /* To convert Unicode characters into UTF-8 for this test, the following
-     command is useful:
-       echo -ne '\x00\x00\x26\x3A' | iconv -f UTF-32BE -t UTF-8 | od -t x1
-     This converts the Unicode character U+263A to UTF-8.  */
-
-  /* Characters used:
-     Code point  Description                    UTF-8 encoding
-     ----------- ------------------------------ --------------
-     U+263A      unfilled smiley face           E2 98 BA
-     U+00A1      inverted exclamation point     C2 A1
-     U+00A3      British pound currency symbol  C2 A3
-     U+03C4      Greek tau                      CF 84
-     U+00E4      lowercase letter a with umlaut C3 A4
-     U+2124      set 'Z' symbol (integers)      E2 84 A4
-     U+2287      subset symbol                  E2 8A 87
-     U+211D      set 'R' symbol (real numbers)  E2 84 9D  */
-
-  str =
-    "Unicode test: happy\xE2\x98\xBA \xC2\xA3 5.00"
-    " \xC2\xA1\xCF\x84\xC3\xA4u! "
-    " \xE2\x84\xA4\xE2\x8A\x87\xE2\x84\x9D";
-  color = grub_video_map_rgb (128, 128, 255);
-
-  /* All characters in the string exist in the 'Fixed 20' (10x20) font.  */
-  texty += grub_font_get_ascent(fixed);
-  grub_font_draw_string (str, fixed, color, 16, texty);
-  texty += grub_font_get_descent (fixed) + grub_font_get_leading (fixed);
-
-  texty += grub_font_get_ascent(sansbig);
-  grub_font_draw_string (str, sansbig, color, 16, texty);
-  texty += grub_font_get_descent (sansbig) + grub_font_get_leading (sansbig);
-
-  texty += grub_font_get_ascent(sans);
-  grub_font_draw_string (str, sans, color, 16, texty);
-  texty += grub_font_get_descent (sans) + grub_font_get_leading (sans);
-
-  texty += grub_font_get_ascent(sanssmall);
-  grub_font_draw_string (str, sanssmall, color, 16, texty);
-  texty += (grub_font_get_descent (sanssmall)
-            + grub_font_get_leading (sanssmall));
-
-  glyph = grub_font_get_glyph (fixed, '*');
-
-  for (i = 0; i < 16; i++)
-    {
-      color = grub_video_map_color (i);
-      palette[i] = color;
-      grub_font_draw_glyph (glyph, color, 16 + i * 16, 220);
-    }
-
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
-
-  for (i = 0; i < 5; i++)
-    {
-      color = grub_video_map_rgb (i, 33, 77);
-      grub_video_fill_rect (color, 0, 0, width, height);
-      grub_video_blit_render_target (text_layer, GRUB_VIDEO_BLIT_BLEND, 0, 0,
-                                     0, 0, width, height);
-      grub_video_swap_buffers ();
-    }
-
-  grub_getkey ();
-
-  grub_video_delete_render_target (text_layer);
-
-  grub_video_restore ();
-
-  for (i = 0; i < 16; i++)
-    grub_printf("color %d: %08x\n", i, palette[i]);
-
-  grub_errno = GRUB_ERR_NONE;
-  return grub_errno;
-}
-
-static grub_command_t cmd;
-
-GRUB_MOD_INIT(videotest)
-{
-  cmd = grub_register_command ("videotest", grub_cmd_videotest,
-			       0, N_("Test video subsystem."));
-}
-
-GRUB_MOD_FINI(videotest)
-{
-  grub_unregister_command (cmd);
-}

conf/Makefile.common

@@ -0,0 +1,154 @@
+# -*- makefile -*-
+
+CFLAGS_PLATFORM=
+
+export LC_COLLATE := C
+unexport LC_ALL
+
+# Platform specific options
+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
+  CFLAGS_PLATFORM += -mno-app-regs
+  LDFLAGS_PLATFORM = -Wl,-melf64_sparc -mno-relax
+endif
+if COND_arm
+  CFLAGS_PLATFORM += -mthumb-interwork -mlong-calls
+  CCASFLAGS_PLATFORM = -mthumb-interwork
+  LDFLAGS_PLATFORM = -Wl,--wrap=__clear_cache
+endif
+
+#FIXME: discover and check XEN headers
+CPPFLAGS_XEN = -I/usr/include
+
+# Other options
+
+CPPFLAGS_DEFAULT = -DGRUB_FILE=\"$(subst $(srcdir)/,,$<)\"
+CPPFLAGS_DEFAULT += -I$(builddir)
+CPPFLAGS_DEFAULT += -I$(srcdir)
+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)
+
+LDADD_KERNEL = $(TARGET_LIBGCC)
+
+CFLAGS_KERNEL = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
+LDFLAGS_KERNEL = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) $(TARGET_LDFLAGS_STATIC_LIBGCC)
+CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
+CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+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_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_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)
+
+CFLAGS_PROGRAM =
+LDFLAGS_PROGRAM =
+CPPFLAGS_PROGRAM =
+CCASFLAGS_PROGRAM =
+
+CFLAGS_LIBRARY =
+CPPFLAGS_LIBRARY =
+CCASFLAGS_LIBRARY =
+
+# Other variables
+
+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 -Wno-old-style-definition
+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_GCRY = -Wno-error -Wno-missing-field-initializers -Wno-redundant-decls -Wno-undef $(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
+
+# List file macros for recognizing /interesting/ modules
+CPPFLAGS_FS_LIST = -Dgrub_fs_register=FS_LIST_MARKER
+CPPFLAGS_VIDEO_LIST= -Dgrub_video_register=VIDEO_LIST_MARKER
+CPPFLAGS_PARTMAP_LIST = -Dgrub_partition_map_register=PARTMAP_LIST_MARKER
+CPPFLAGS_PARTTOOL_LIST = -Dgrub_parttool_register=PARTTOOL_LIST_MARKER
+CPPFLAGS_TERMINAL_LIST = '-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)'
+CPPFLAGS_TERMINAL_LIST += '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)'
+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_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \
+	$(CPPFLAGS_PARTTOOL_LIST) $(CPPFLAGS_PARTMAP_LIST) \
+	$(CPPFLAGS_TERMINAL_LIST) $(CPPFLAGS_COMMAND_LIST)
+
+# Define these variables to calm down automake
+
+IMG_FILES =
+MOD_FILES =
+MODULE_FILES =
+MARKER_FILES =
+KERNEL_HEADER_FILES =
+
+man_MANS =
+noinst_DATA =
+pkgdata_DATA =
+bin_SCRIPTS =
+sbin_SCRIPTS =
+bin_PROGRAMS =
+platform_DATA =
+sbin_PROGRAMS =
+check_SCRIPTS =
+dist_grubconf_DATA =
+check_PROGRAMS =
+noinst_SCRIPTS =
+noinst_PROGRAMS =
+grubconf_SCRIPTS =
+noinst_LIBRARIES =
+dist_noinst_DATA =
+platform_SCRIPTS =
+platform_PROGRAMS =
+
+TESTS =
+EXTRA_DIST =
+CLEANFILES =
+BUILT_SOURCES =
+
+# 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)/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)/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
+	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 $@

conf/Makefile.extra-dist

@@ -0,0 +1,112 @@
+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 += 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-pc-cygwin-img-ld.sc
+
+EXTRA_DIST += grub-core/Makefile.core.def
+EXTRA_DIST += grub-core/Makefile.gcry.def
+
+EXTRA_DIST += grub-core/genmoddep.awk
+EXTRA_DIST += grub-core/genmod.sh.in
+EXTRA_DIST += grub-core/gensyminfo.sh.in
+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
+
+EXTRA_DIST += grub-core/fs/cpio_common.c
+
+EXTRA_DIST += BUGS
+EXTRA_DIST += util/i386/efi/grub-dumpdevtree
+EXTRA_DIST += util/spkmodem-recv.c
+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-pe2elf.c
+
+EXTRA_DIST += m4/gnulib-cache.m4
+EXTRA_DIST += m4/glibc2.m4
+EXTRA_DIST += m4/gnulib-tool.m4
+EXTRA_DIST += m4/intdiv0.m4
+EXTRA_DIST += m4/intl.m4
+EXTRA_DIST += m4/intldir.m4
+EXTRA_DIST += m4/intmax.m4
+EXTRA_DIST += m4/inttypes-pri.m4
+EXTRA_DIST += m4/lcmessage.m4
+EXTRA_DIST += m4/lock.m4
+EXTRA_DIST += m4/printf-posix.m4
+EXTRA_DIST += m4/threadlib.m4
+EXTRA_DIST += m4/uintmax_t.m4
+EXTRA_DIST += m4/visibility.m4
+EXTRA_DIST += m4/math_h.m4
+
+EXTRA_DIST += grub-core/osdep/apple/hostdisk.c
+EXTRA_DIST += grub-core/osdep/aros/hostdisk.c
+EXTRA_DIST += grub-core/osdep/basic/hostdisk.c
+EXTRA_DIST += grub-core/osdep/bsd/hostdisk.c
+EXTRA_DIST += grub-core/osdep/freebsd/hostdisk.c
+EXTRA_DIST += grub-core/osdep/hurd/hostdisk.c
+EXTRA_DIST += grub-core/osdep/linux/hostdisk.c
+EXTRA_DIST += grub-core/osdep/windows/hostdisk.c
+EXTRA_DIST += grub-core/osdep/sun/hostdisk.c
+EXTRA_DIST += grub-core/osdep/haiku/hostdisk.c
+
+EXTRA_DIST += grub-core/osdep/basic/init.c
+EXTRA_DIST += grub-core/osdep/windows/init.c
+
+EXTRA_DIST += grub-core/osdep/apple/getroot.c
+EXTRA_DIST += grub-core/osdep/aros/getroot.c
+EXTRA_DIST += grub-core/osdep/basic/getroot.c
+EXTRA_DIST += grub-core/osdep/bsd/getroot.c
+EXTRA_DIST += grub-core/osdep/windows/getroot.c
+EXTRA_DIST += grub-core/osdep/freebsd/getroot.c
+EXTRA_DIST += grub-core/osdep/hurd/getroot.c
+EXTRA_DIST += grub-core/osdep/linux/getroot.c
+EXTRA_DIST += grub-core/osdep/sun/getroot.c
+EXTRA_DIST += grub-core/osdep/haiku/getroot.c
+
+EXTRA_DIST += grub-core/osdep/basic/random.c
+EXTRA_DIST += grub-core/osdep/basic/ofpath.c
+
+EXTRA_DIST += grub-core/osdep/unix/password.c
+EXTRA_DIST += grub-core/osdep/unix/random.c
+EXTRA_DIST += grub-core/osdep/unix/sleep.c
+
+EXTRA_DIST += grub-core/osdep/linux/ofpath.c
+
+EXTRA_DIST += grub-core/osdep/windows/password.c
+EXTRA_DIST += grub-core/osdep/windows/random.c
+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
+

conf/any-emu.rmk

@@ -1,129 +0,0 @@
-# -*- makefile -*-
-
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
-sbin_UTILITIES += grub-emu
-util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
-	commands/configfile.c commands/echo.c commands/help.c		\
-	commands/handler.c commands/ls.c commands/test.c 		\
-	commands/search_wrap.c commands/search_file.c			\
-	commands/search_label.c commands/search_uuid.c			\
-	commands/blocklist.c commands/hexdump.c				\
-	lib/hexdump.c commands/halt.c commands/reboot.c			\
-	lib/envblk.c commands/loadenv.c					\
-	commands/gptsync.c commands/probe.c commands/xnu_uuid.c		\
-	commands/password.c commands/keystatus.c			\
-	disk/host.c disk/loopback.c disk/scsi.c				\
-	fs/fshelp.c 							\
-	\
-	io/gzio.c							\
-	kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c	\
-	kern/err.c kern/list.c kern/handler.c				\
-	kern/command.c kern/corecmd.c commands/extcmd.c	kern/file.c	\
-	kern/fs.c commands/boot.c kern/main.c kern/misc.c kern/parser.c	\
-	kern/partition.c kern/term.c					\
-	kern/rescue_reader.c kern/rescue_parser.c			\
-	lib/arg.c normal/cmdline.c normal/datetime.c normal/misc.c	\
-	normal/handler.c normal/auth.c lib/crypto.c normal/autofs.c	\
-	normal/completion.c normal/main.c normal/color.c		\
-	normal/menu.c normal/menu_entry.c		\
-	normal/menu_text.c normal/crypto.c normal/term.c		\
-	commands/terminal.c normal/context.c lib/charset.c \
-	script/main.c script/execute.c script/function.c		\
-	script/lexer.c script/script.c grub_script.tab.c		\
-	partmap/amiga.c	partmap/apple.c partmap/msdos.c partmap/sun.c	\
-	partmap/acorn.c partmap/gpt.c					\
-	\
-	fs/affs.c fs/cpio.c  fs/fat.c fs/ext2.c fs/hfs.c		\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
-	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c			\
-	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c		\
-	fs/befs.c fs/befs_be.c fs/tar.c					\
-	\
-	video/video.c video/fb/video_fb.c video/fb/fbblit.c             \
-        video/fb/fbfill.c video/fb/fbutil.c commands/videotest.c        \
-	video/bitmap.c video/bitmap_scale.c video/readers/tga.c 	\
-	video/readers/jpeg.c video/readers/png.c font/font_cmd.c 	\
-	font/font.c term/gfxterm.c io/bufio.c				\
-	\
-	gfxmenu/gfxmenu.c gfxmenu/model.c gfxmenu/view.c 		\
-	gfxmenu/icon_manager.c gfxmenu/theme_loader.c 			\
-	gfxmenu/widget-box.c gfxmenu/gui_canvas.c 			\
-	gfxmenu/gui_circular_progress.c gfxmenu/gui_box.c 		\
-	gfxmenu/gui_label.c gfxmenu/gui_list.c gfxmenu/gui_image.c 	\
-	gfxmenu/gui_progress_bar.c gfxmenu/gui_util.c 			\
-	gfxmenu/gui_string_util.c gfxmenu/named_colors.c trigtables.c   \
-	\
-	util/console.c util/hostfs.c util/grub-emu.c util/misc.c	\
-	util/hostdisk.c util/getroot.c					\
-	\
-	disk/raid.c disk/raid5_recover.c disk/raid6_recover.c		\
-	disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c		\
-	commands/parttool.c parttool/msdospart.c			\
-	lib/libgcrypt-grub/cipher/md5.c \
-	grub_emu_init.c gnulib/progname.c
-grub_emu_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap
-
-
-ifeq ($(target_cpu), i386)
-grub_emu_SOURCES += commands/i386/cpuid.c
-endif
-
-grub_emu_LDFLAGS = $(LIBCURSES)
-
-ifeq ($(enable_grub_emu_usb), yes)
-grub_emu_SOURCES += disk/usbms.c util/usb.c bus/usb/usb.c	\
-		commands/usbtest.c
-grub_emu_LDFLAGS += $(LIBCURSES) $(LIBUSB)
-endif
-
-ifeq ($(enable_grub_emu_sdl), yes)
-grub_emu_SOURCES += util/sdl.c
-grub_emu_LDFLAGS += $(LIBSDL)
-endif
-
-ifeq ($(enable_grub_emu_pci), yes)
-grub_emu_SOURCES += util/pci.c commands/lspci.c
-grub_emu_LDFLAGS += $(LIBPCIACCESS)
-endif
-
-grub_emu_init.lst: geninit.sh $(filter-out grub_emu_init.c,$(grub_emu_SOURCES))
-	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
-DISTCLEANFILES += grub_emu_init.lst
-
-grub_emu_init.h: grub_emu_init.lst $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh
-	rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
-DISTCLEANFILES += grub_emu_init.h
-
-grub_emu_init.c: grub_emu_init.lst $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_emu_init.h
-	rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
-DISTCLEANFILES += grub_emu_init.c
-
-
-
-
-# FIXME: this could be shared with common.rmk
-
-trigtables.c: gentrigtables
-	./gentrigtables > $@
-DISTCLEANFILES += trigtables.c
-gentrigtables: gentrigtables.c
-	$(CC) -o $@ $^ $(CPPFLAGS) -lm
-DISTCLEANFILES += gentrigtables
-
-# For grub-mkfont.
-ifeq ($(enable_grub_mkfont), yes)
-bin_UTILITIES += grub-mkfont
-grub_mkfont_SOURCES = gnulib/progname.c util/grub-mkfont.c util/misc.c
-grub_mkfont_CFLAGS = $(freetype_cflags)
-grub_mkfont_LDFLAGS = $(freetype_libs)
-endif
-
-grub_script.tab.c grub_script.tab.h: script/parser.y
-	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
-DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
-
-bin_UTILITIES += grub-bin2h
-grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c

conf/common.rmk

@@ -1,782 +0,0 @@
-# -*- makefile -*-
-
-sbin_UTILITIES += grub-mkdevicemap
-grub_mkdevicemap_SOURCES = gnulib/progname.c util/grub-mkdevicemap.c \
-	util/deviceiter.c \
-	util/misc.c
-
-ifeq ($(target_cpu)-$(platform), sparc64-ieee1275)
-grub_mkdevicemap_SOURCES += util/ieee1275/ofpath.c util/ieee1275/devicemap.c
-else
-grub_mkdevicemap_SOURCES += util/devicemap.c
-endif
-
-# For grub-mkelfimage.
-bin_UTILITIES += grub-mkelfimage
-grub_mkelfimage_SOURCES = gnulib/progname.c \
-	util/elf/grub-mkimage.c util/misc.c \
-	util/resolve.c
-util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
-
-# For grub-probe.
-sbin_UTILITIES += grub-probe
-util/grub-probe.c_DEPENDENCIES = grub_probe_init.h
-grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c	\
-	util/hostdisk.c	util/misc.c util/getroot.c		\
-	kern/device.c kern/disk.c kern/err.c kern/misc.c	\
-	kern/parser.c kern/partition.c kern/file.c		\
-	\
-	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c		\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
-	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c		\
-	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c	\
-	fs/befs.c fs/befs_be.c fs/tar.c		\
-	\
-	partmap/msdos.c partmap/apple.c partmap/sun.c partmap/gpt.c\
-	kern/fs.c kern/env.c fs/fshelp.c			\
-	disk/raid.c disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
-
-ifeq ($(enable_grub_fstest), yes)
-bin_UTILITIES += grub-fstest
-endif
-
-bin_UTILITIES += grub-mkisofs
-grub_mkisofs_SOURCES = util/mkisofs/eltorito.c 				\
-	util/mkisofs/hash.c util/mkisofs/joliet.c			\
-	util/mkisofs/match.c util/mkisofs/mkisofs.c			\
-	util/mkisofs/multi.c util/mkisofs/name.c			\
-	util/mkisofs/rock.c util/mkisofs/tree.c				\
-	util/mkisofs/write.c						\
-	\
-	gnulib/fnmatch.c gnulib/getopt1.c gnulib/getopt.c		\
-	gnulib/error.c gnulib/progname.c
-grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64 				\
-	-I$(srcdir)/util/mkisofs/include				\
-	-Wno-all -Werror
-
-# For grub-fstest.
-util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h
-grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c util/hostfs.c \
-	util/misc.c 	\
-	kern/file.c kern/device.c kern/disk.c kern/err.c kern/misc.c	\
-	disk/host.c disk/loopback.c kern/list.c kern/command.c		\
-	lib/arg.c commands/extcmd.c normal/datetime.c normal/misc.c	\
-	lib/hexdump.c lib/crc.c commands/blocklist.c commands/ls.c 	\
-	\
-	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c			\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
-	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c			\
-	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c fs/befs.c 	\
-	fs/befs_be.c fs/tar.c			\
-	\
-	kern/partition.c partmap/msdos.c partmap/apple.c partmap/sun.c	\
-	partmap/gpt.c							\
-	kern/fs.c kern/env.c fs/fshelp.c disk/raid.c			\
-	disk/raid5_recover.c disk/raid6_recover.c 			\
-	disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c 		\
-	grub_fstest_init.c
-
-# For grub-mkfont.
-ifeq ($(enable_grub_mkfont), yes)
-bin_UTILITIES += grub-mkfont
-grub_mkfont_SOURCES = gnulib/progname.c util/grub-mkfont.c util/misc.c
-grub_mkfont_CFLAGS = $(freetype_cflags)
-grub_mkfont_LDFLAGS = $(freetype_libs)
-endif
-
-# For grub-mkrelpath.
-bin_UTILITIES += grub-mkrelpath
-grub_mkrelpath_SOURCES = gnulib/progname.c util/grub-mkrelpath.c util/misc.c
-
-bin_UTILITIES += grub-bin2h
-grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c
-
-# For grub-script-check.
-bin_UTILITIES += grub-script-check
-util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
-grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c \
-	util/grub-script-check.c util/misc.c \
-	script/main.c script/script.c script/function.c script/lexer.c \
-	kern/handler.c kern/err.c kern/parser.c kern/list.c \
-	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c
-
-# For the parser.
-grub_script.tab.c grub_script.tab.h: script/parser.y
-	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
-DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
-
-# For grub-script-check.
-grub_script_check_init.lst: geninit.sh $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES))
-	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
-DISTCLEANFILES += grub_script_check_init.lst
-
-grub_script_check_init.h: grub_script_check_init.lst $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES)) geninitheader.sh
-	rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
-DISTCLEANFILES += grub_script_check_init.h
-
-grub_script_check_init.c: grub_script_check_init.lst $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES)) geninit.sh
-	rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
-DISTCLEANFILES += grub_script_check_init.c
-
-# For grub-probe.
-grub_probe_init.lst: geninit.sh $(filter-out grub_probe_init.c,$(grub_probe_SOURCES))
-	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
-DISTCLEANFILES += grub_probe_init.lst
-
-grub_probe_init.h: grub_probe_init.lst $(filter-out grub_probe_init.c,$(grub_probe_SOURCES)) geninitheader.sh
-	rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
-DISTCLEANFILES += grub_probe_init.h
-
-grub_probe_init.c: grub_probe_init.lst $(filter-out grub_probe_init.c,$(grub_probe_SOURCES)) geninit.sh grub_probe_init.h
-	rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
-DISTCLEANFILES += grub_probe_init.c
-
-# For grub-setup.
-grub_setup_init.lst: geninit.sh $(filter-out grub_setup_init.c,$(grub_setup_SOURCES))
-	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
-DISTCLEANFILES += grub_setup_init.lst
-
-grub_setup_init.h: grub_setup_init.lst $(filter-out grub_setup_init.c,$(grub_setup_SOURCES)) geninitheader.sh
-	rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
-DISTCLEANFILES += grub_setup_init.h
-
-grub_setup_init.c: grub_setup_init.lst $(filter-out grub_setup_init.c,$(grub_setup_SOURCES)) geninit.sh grub_setup_init.h
-	rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
-DISTCLEANFILES += grub_setup_init.c
-
-# For grub-fstest.
-grub_fstest_init.lst: geninit.sh $(filter-out grub_fstest_init.c,$(grub_fstest_SOURCES))
-	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
-DISTCLEANFILES += grub_fstest_init.lst
-
-grub_fstest_init.h: grub_fstest_init.lst $(filter-out grub_fstest_init.c,$(grub_fstest_SOURCES)) geninitheader.sh
-	rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
-DISTCLEANFILES += grub_fstest_init.h
-
-grub_fstest_init.c: grub_fstest_init.lst $(filter-out grub_fstest_init.c,$(grub_fstest_SOURCES)) geninit.sh grub_fstest_init.h
-	rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
-DISTCLEANFILES += grub_fstest_init.c
-
-# for grub-editenv
-bin_UTILITIES += grub-editenv
-grub_editenv_SOURCES = gnulib/progname.c util/grub-editenv.c lib/envblk.c util/misc.c kern/misc.c kern/err.c
-CLEANFILES += grub-editenv
-
-# Needed for genmk.rb to work
-ifeq (0,1)
-bin_UTILITIES += grub-macho2img grub-pe2elf
-endif
-
-grub_pe2elf_SOURCES = gnulib/progname.c util/grub-pe2elf.c util/misc.c
-CLEANFILES += grub-pe2elf
-
-grub_macho2img_SOURCES = util/grub-macho2img.c
-CLEANFILES += grub-macho2img
-
-# For grub-mkconfig
-grub-mkconfig: util/grub-mkconfig.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-sbin_SCRIPTS += grub-mkconfig
-CLEANFILES += grub-mkconfig
-
-grub-mkconfig_lib: util/grub-mkconfig_lib.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-lib_SCRIPTS += grub-mkconfig_lib
-CLEANFILES += grub-mkconfig_lib
-
-update-grub_lib: util/update-grub_lib.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-lib_SCRIPTS += update-grub_lib
-CLEANFILES += update-grub_lib
-
-grub-gettext_lib: util/grub-gettext_lib.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-lib_DATA += grub-gettext_lib
-CLEANFILES += grub-gettext_lib
-
-%: util/grub.d/%.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-grub-mkconfig_SCRIPTS = 00_header 30_os-prober 40_custom
-ifneq (, $(host_kernel))
-grub-mkconfig_SCRIPTS += 10_$(host_kernel)
-endif
-
-CLEANFILES += $(grub-mkconfig_SCRIPTS)
-
-grub-mkconfig_DATA += util/grub.d/README
-
-# For grub-set-default.
-grub-set-default: util/grub-set-default.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-sbin_SCRIPTS += grub-set-default
-CLEANFILES += grub-set-default
-
-# For grub-reboot.
-grub-reboot: util/grub-reboot.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-sbin_SCRIPTS += grub-reboot
-CLEANFILES += grub-reboot
-
-# Filing systems.
-pkglib_MODULES += fshelp.mod fat.mod ufs1.mod ufs2.mod ext2.mod ntfs.mod \
-	ntfscomp.mod minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod	\
-	affs.mod sfs.mod hfsplus.mod reiserfs.mod cpio.mod tar.mod	\
-	udf.mod	afs.mod afs_be.mod befs.mod befs_be.mod
-
-# For fshelp.mod.
-fshelp_mod_SOURCES = fs/fshelp.c
-fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
-fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For fat.mod.
-fat_mod_SOURCES = fs/fat.c
-fat_mod_CFLAGS = $(COMMON_CFLAGS)
-fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ufs1.mod.
-ufs1_mod_SOURCES = fs/ufs.c
-ufs1_mod_CFLAGS = $(COMMON_CFLAGS)
-ufs1_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ufs2.mod.
-ufs2_mod_SOURCES = fs/ufs2.c
-ufs2_mod_CFLAGS = $(COMMON_CFLAGS)
-ufs2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ext2.mod.
-ext2_mod_SOURCES = fs/ext2.c
-ext2_mod_CFLAGS = $(COMMON_CFLAGS)
-ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ntfs.mod.
-ntfs_mod_SOURCES = fs/ntfs.c
-ntfs_mod_CFLAGS = $(COMMON_CFLAGS)
-ntfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ntfscomp.mod.
-ntfscomp_mod_SOURCES = fs/ntfscomp.c
-ntfscomp_mod_CFLAGS = $(COMMON_CFLAGS)
-ntfscomp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For minix.mod.
-minix_mod_SOURCES = fs/minix.c
-minix_mod_CFLAGS = $(COMMON_CFLAGS)
-minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hfs.mod.
-hfs_mod_SOURCES = fs/hfs.c
-hfs_mod_CFLAGS = $(COMMON_CFLAGS)
-hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For jfs.mod.
-jfs_mod_SOURCES = fs/jfs.c
-jfs_mod_CFLAGS = $(COMMON_CFLAGS)
-jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For iso9660.mod.
-iso9660_mod_SOURCES = fs/iso9660.c
-iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
-iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For xfs.mod.
-xfs_mod_SOURCES = fs/xfs.c
-xfs_mod_CFLAGS = $(COMMON_CFLAGS)
-xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For affs.mod.
-affs_mod_SOURCES = fs/affs.c
-affs_mod_CFLAGS = $(COMMON_CFLAGS)
-affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sfs.mod.
-sfs_mod_SOURCES = fs/sfs.c
-sfs_mod_CFLAGS = $(COMMON_CFLAGS)
-sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hfsplus.mod.
-hfsplus_mod_SOURCES = fs/hfsplus.c
-hfsplus_mod_CFLAGS = $(COMMON_CFLAGS)
-hfsplus_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For reiserfs.mod.
-reiserfs_mod_SOURCES = fs/reiserfs.c
-reiserfs_mod_CFLAGS = $(COMMON_CFLAGS)
-reiserfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cpio.mod.
-cpio_mod_SOURCES = fs/cpio.c
-cpio_mod_CFLAGS = $(COMMON_CFLAGS)
-cpio_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For tar.mod.
-tar_mod_SOURCES = fs/tar.c
-tar_mod_CFLAGS = $(COMMON_CFLAGS)
-tar_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For udf.mod.
-udf_mod_SOURCES = fs/udf.c
-udf_mod_CFLAGS = $(COMMON_CFLAGS)
-udf_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For afs.mod.
-afs_mod_SOURCES = fs/afs.c
-afs_mod_CFLAGS = $(COMMON_CFLAGS)
-afs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For afs_be.mod.
-afs_be_mod_SOURCES = fs/afs_be.c
-afs_be_mod_CFLAGS = $(COMMON_CFLAGS)
-afs_be_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For befs.mod.
-befs_mod_SOURCES = fs/befs.c
-befs_mod_CFLAGS = $(COMMON_CFLAGS)
-befs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For befs_be.mod.
-befs_be_mod_SOURCES = fs/befs_be.c
-befs_be_mod_CFLAGS = $(COMMON_CFLAGS)
-befs_be_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Partition maps.
-
-pkglib_MODULES += part_amiga.mod
-part_amiga_mod_SOURCES = partmap/amiga.c
-part_amiga_mod_CFLAGS = $(COMMON_CFLAGS)
-part_amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += part_apple.mod
-part_apple_mod_SOURCES = partmap/apple.c
-part_apple_mod_CFLAGS = $(COMMON_CFLAGS)
-part_apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += part_msdos.mod
-part_msdos_mod_SOURCES = partmap/msdos.c
-part_msdos_mod_CFLAGS = $(COMMON_CFLAGS)
-part_msdos_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += part_sun.mod
-part_sun_mod_SOURCES = partmap/sun.c
-part_sun_mod_CFLAGS = $(COMMON_CFLAGS)
-part_sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += part_acorn.mod
-part_acorn_mod_SOURCES = partmap/acorn.c
-part_acorn_mod_CFLAGS = $(COMMON_CFLAGS)
-part_acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += part_gpt.mod
-part_gpt_mod_SOURCES = partmap/gpt.c
-part_gpt_mod_CFLAGS = $(COMMON_CFLAGS)
-part_gpt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Special disk structures and generic drivers
-
-pkglib_MODULES += raid.mod raid5rec.mod raid6rec.mod mdraid.mod dm_nv.mod \
-	lvm.mod scsi.mod
-
-# For raid.mod
-raid_mod_SOURCES = disk/raid.c
-raid_mod_CFLAGS = $(COMMON_CFLAGS)
-raid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For raid5rec.mod
-raid5rec_mod_SOURCES = disk/raid5_recover.c
-raid5rec_mod_CFLAGS = $(COMMON_CFLAGS)
-raid5rec_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For raid6rec.mod
-raid6rec_mod_SOURCES = disk/raid6_recover.c
-raid6rec_mod_CFLAGS = $(COMMON_CFLAGS)
-raid6rec_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mdraid.mod
-mdraid_mod_SOURCES = disk/mdraid_linux.c
-mdraid_mod_CFLAGS = $(COMMON_CFLAGS)
-mdraid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For dm_nv.mod
-dm_nv_mod_SOURCES = disk/dmraid_nvidia.c
-dm_nv_mod_CFLAGS = $(COMMON_CFLAGS)
-dm_nv_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lvm.mod
-lvm_mod_SOURCES = disk/lvm.c
-lvm_mod_CFLAGS = $(COMMON_CFLAGS)
-lvm_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For scsi.mod
-scsi_mod_SOURCES = disk/scsi.c
-scsi_mod_CFLAGS = $(COMMON_CFLAGS)
-scsi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Commands.
-pkglib_MODULES += minicmd.mod extcmd.mod hello.mod handler.mod	\
-	ls.mod cmp.mod cat.mod help.mod search.mod loopback.mod	\
-	configfile.mod echo.mod		\
-	terminfo.mod test.mod blocklist.mod hexdump.mod		\
-	read.mod sleep.mod loadenv.mod crc.mod parttool.mod	\
-	msdospart.mod memrw.mod normal.mod sh.mod 		\
-	gptsync.mod true.mod probe.mod password.mod		\
-	keystatus.mod
-
-# For password.mod.
-password_mod_SOURCES = commands/password.c
-password_mod_CFLAGS = $(COMMON_CFLAGS)
-password_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gptsync.mod.
-gptsync_mod_SOURCES = commands/gptsync.c
-gptsync_mod_CFLAGS = $(COMMON_CFLAGS)
-gptsync_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For minicmd.mod.
-minicmd_mod_SOURCES = commands/minicmd.c
-minicmd_mod_CFLAGS = $(COMMON_CFLAGS)
-minicmd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For extcmd.mod.
-extcmd_mod_SOURCES = commands/extcmd.c lib/arg.c
-extcmd_mod_CFLAGS = $(COMMON_CFLAGS)
-extcmd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hello.mod.
-hello_mod_SOURCES = hello/hello.c
-hello_mod_CFLAGS = $(COMMON_CFLAGS)
-hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gfxmenu.mod.
-pkglib_MODULES += gfxmenu.mod
-gfxmenu_mod_SOURCES = \
-	gfxmenu/gfxmenu.c \
-	gfxmenu/model.c \
-	gfxmenu/view.c \
-	gfxmenu/icon_manager.c \
-	gfxmenu/theme_loader.c \
-	gfxmenu/widget-box.c \
-	gfxmenu/gui_canvas.c \
-	gfxmenu/gui_circular_progress.c \
-	gfxmenu/gui_box.c \
-	gfxmenu/gui_label.c \
-	gfxmenu/gui_list.c \
-	gfxmenu/gui_image.c \
-	gfxmenu/gui_progress_bar.c \
-	gfxmenu/gui_util.c \
-	gfxmenu/gui_string_util.c \
-	gfxmenu/named_colors.c
-gfxmenu_mod_CFLAGS = $(COMMON_CFLAGS)
-gfxmenu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For parttool.mod.
-parttool_mod_SOURCES = commands/parttool.c
-parttool_mod_CFLAGS = $(COMMON_CFLAGS)
-parttool_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For msdospart.mod.
-msdospart_mod_SOURCES = parttool/msdospart.c
-msdospart_mod_CFLAGS = $(COMMON_CFLAGS)
-msdospart_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For handler.mod.
-handler_mod_SOURCES = commands/handler.c
-handler_mod_CFLAGS = $(COMMON_CFLAGS)
-handler_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ls.mod.
-ls_mod_SOURCES = commands/ls.c
-ls_mod_CFLAGS = $(COMMON_CFLAGS)
-ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cmp.mod.
-cmp_mod_SOURCES = commands/cmp.c
-cmp_mod_CFLAGS = $(COMMON_CFLAGS)
-cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cat.mod.
-cat_mod_SOURCES = commands/cat.c
-cat_mod_CFLAGS = $(COMMON_CFLAGS)
-cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For echo.mod
-echo_mod_SOURCES = commands/echo.c
-echo_mod_CFLAGS = $(COMMON_CFLAGS)
-echo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For help.mod.
-help_mod_SOURCES = commands/help.c
-help_mod_CFLAGS = $(COMMON_CFLAGS)
-help_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For search.mod.
-search_mod_SOURCES = commands/search_wrap.c
-search_mod_CFLAGS = $(COMMON_CFLAGS)
-search_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += search_fs_file.mod search_fs_uuid.mod search_label.mod
-
-# For search.mod.
-search_fs_file_mod_SOURCES = commands/search_file.c
-search_fs_file_mod_CFLAGS = $(COMMON_CFLAGS)
-search_fs_file_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For search.mod.
-search_label_mod_SOURCES = commands/search_label.c
-search_label_mod_CFLAGS = $(COMMON_CFLAGS)
-search_label_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For search.mod.
-search_fs_uuid_mod_SOURCES = commands/search_uuid.c
-search_fs_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
-search_fs_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For test.mod.
-test_mod_SOURCES = commands/test.c
-test_mod_CFLAGS = $(COMMON_CFLAGS)
-test_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loopback.mod
-loopback_mod_SOURCES = disk/loopback.c
-loopback_mod_CFLAGS = $(COMMON_CFLAGS)
-loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For configfile.mod
-configfile_mod_SOURCES = commands/configfile.c
-configfile_mod_CFLAGS = $(COMMON_CFLAGS)
-configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For terminfo.mod.
-terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
-terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
-terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For blocklist.mod.
-blocklist_mod_SOURCES = commands/blocklist.c
-blocklist_mod_CFLAGS = $(COMMON_CFLAGS)
-blocklist_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hexdump.mod.
-hexdump_mod_SOURCES = commands/hexdump.c lib/hexdump.c
-hexdump_mod_CFLAGS = $(COMMON_CFLAGS)
-hexdump_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For read.mod.
-read_mod_SOURCES = commands/read.c
-read_mod_CFLAGS = $(COMMON_CFLAGS)
-read_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sleep.mod.
-sleep_mod_SOURCES = commands/sleep.c
-sleep_mod_CFLAGS = $(COMMON_CFLAGS)
-sleep_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loadenv.mod.
-loadenv_mod_SOURCES = commands/loadenv.c lib/envblk.c
-loadenv_mod_CFLAGS = $(COMMON_CFLAGS)
-loadenv_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For crc.mod.
-crc_mod_SOURCES = commands/crc.c lib/crc.c
-crc_mod_CFLAGS = $(COMMON_CFLAGS)
-crc_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memrw.mod.
-memrw_mod_SOURCES = commands/memrw.c
-memrw_mod_CFLAGS = $(COMMON_CFLAGS)
-memrw_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For true.mod
-true_mod_SOURCES = commands/true.c
-true_mod_CFLAGS = $(COMMON_CFLAGS)
-true_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For probe.mod.
-probe_mod_SOURCES = commands/probe.c
-probe_mod_CFLAGS = $(COMMON_CFLAGS)
-probe_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For keystatus.mod.
-keystatus_mod_SOURCES = commands/keystatus.c
-keystatus_mod_CFLAGS = $(COMMON_CFLAGS)
-keystatus_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For normal.mod.
-normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
-	normal/auth.c normal/autofs.c normal/handler.c \
-	normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
-	normal/menu_entry.c normal/menu_text.c \
-	normal/misc.c normal/crypto.c normal/term.c normal/context.c
-normal_mod_CFLAGS = $(COMMON_CFLAGS)
-normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sh.mod.
-sh_mod_SOURCES = script/main.c script/script.c script/execute.c \
-	script/function.c script/lexer.c grub_script.tab.c
-sh_mod_CFLAGS = $(COMMON_CFLAGS)
-sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-ifneq (, $(FONT_SOURCE))
-font/font.c_DEPENDENCIES = ascii.h
-endif
-
-# Common Video Subsystem specific modules.
-# On Yeeloong it's part of kernel
-ifneq ($(platform), yeeloong)
-
-# For video.mod.
-pkglib_MODULES += video.mod
-video_mod_SOURCES = video/video.c
-video_mod_CFLAGS = $(COMMON_CFLAGS)
-video_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += video_fb.mod
-video_fb_mod_SOURCES = video/fb/video_fb.c video/fb/fbblit.c \
-		  video/fb/fbfill.c video/fb/fbutil.c
-video_fb_mod_CFLAGS = $(COMMON_CFLAGS)
-video_fb_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bitmap.mod
-pkglib_MODULES += bitmap.mod
-bitmap_mod_SOURCES = video/bitmap.c
-bitmap_mod_CFLAGS = $(COMMON_CFLAGS)
-bitmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bitmap_scale.mod
-pkglib_MODULES += bitmap_scale.mod
-bitmap_scale_mod_SOURCES = video/bitmap_scale.c
-bitmap_scale_mod_CFLAGS = $(COMMON_CFLAGS)
-bitmap_scale_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += font.mod
-font_mod_SOURCES = font/font_cmd.c font/font.c
-font_mod_CFLAGS = $(COMMON_CFLAGS)
-font_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gfxterm.mod.
-pkglib_MODULES += gfxterm.mod
-gfxterm_mod_SOURCES = term/gfxterm.c
-gfxterm_mod_CFLAGS = $(COMMON_CFLAGS)
-gfxterm_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-endif
-
-# For videotest.mod.
-pkglib_MODULES += videotest.mod
-videotest_mod_SOURCES = commands/videotest.c
-videotest_mod_CFLAGS = $(COMMON_CFLAGS)
-videotest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For tga.mod
-pkglib_MODULES += tga.mod
-tga_mod_SOURCES = video/readers/tga.c
-tga_mod_CFLAGS = $(COMMON_CFLAGS)
-tga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For jpeg.mod.
-pkglib_MODULES += jpeg.mod
-jpeg_mod_SOURCES = video/readers/jpeg.c
-jpeg_mod_CFLAGS = $(COMMON_CFLAGS)
-jpeg_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For png.mod.
-pkglib_MODULES += png.mod
-png_mod_SOURCES = video/readers/png.c
-png_mod_CFLAGS = $(COMMON_CFLAGS)
-png_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-
-# Misc.
-pkglib_MODULES += gzio.mod elf.mod
-
-# For elf.mod.
-elf_mod_SOURCES = kern/elf.c
-elf_mod_CFLAGS = $(COMMON_CFLAGS)
-elf_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gzio.mod.
-gzio_mod_SOURCES = io/gzio.c
-gzio_mod_CFLAGS = $(COMMON_CFLAGS)
-gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# On Yeeloong it's part of kernel
-ifneq ($(platform), yeeloong)
-# For bufio.mod.
-pkglib_MODULES += bufio.mod
-bufio_mod_SOURCES = io/bufio.c
-bufio_mod_CFLAGS = $(COMMON_CFLAGS)
-bufio_mod_LDFLAGS = $(COMMON_LDFLAGS)
-endif
-
-# For gettext.mod.
-pkglib_MODULES += gettext.mod
-gettext_mod_SOURCES = gettext/gettext.c
-gettext_mod_CFLAGS = $(COMMON_CFLAGS)
-gettext_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Misc.
-pkglib_MODULES += xnu_uuid.mod
-
-# For elf.mod.
-xnu_uuid_mod_SOURCES = commands/xnu_uuid.c
-xnu_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
-xnu_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += trig.mod
-trig_mod_SOURCES = trigtables.c
-trig_mod_CFLAGS = $(COMMON_CFLAGS)
-trig_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-trigtables.c: gentrigtables
-	./gentrigtables > $@
-DISTCLEANFILES += trigtables.c
-gentrigtables: gentrigtables.c
-	$(CC) -o $@ $^ $(CPPFLAGS) -lm
-DISTCLEANFILES += gentrigtables
-
-pkglib_MODULES += setjmp.mod
-setjmp_mod_SOURCES = lib/$(target_cpu)/setjmp.S
-setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
-setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += charset.mod
-charset_mod_SOURCES = lib/charset.c
-charset_mod_CFLAGS = $(COMMON_CFLAGS)
-charset_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += terminal.mod
-terminal_mod_SOURCES = commands/terminal.c
-terminal_mod_CFLAGS = $(COMMON_CFLAGS)
-terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += crypto.mod
-crypto_mod_SOURCES = lib/crypto.c
-crypto_mod_CFLAGS = $(COMMON_CFLAGS)
-crypto_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += hashsum.mod
-hashsum_mod_SOURCES = commands/hashsum.c
-hashsum_mod_CFLAGS = $(COMMON_CFLAGS)
-hashsum_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += pbkdf2.mod
-pbkdf2_mod_SOURCES = lib/pbkdf2.c
-pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
-pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For password_pbkdf2.mod.
-pkglib_MODULES += password_pbkdf2.mod
-password_pbkdf2_mod_SOURCES = commands/password_pbkdf2.c
-password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
-password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-bin_UTILITIES += grub-mkpasswd-pbkdf2
-grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
-grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
-
-include $(srcdir)/conf/gcry.mk

conf/i386-coreboot.rmk

@@ -1,200 +0,0 @@
-# -*- makefile -*-
-
-COMMON_ASFLAGS	= -nostdinc -fno-builtin -m32
-COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
-COMMON_LDFLAGS	= -m32 -nostdlib
-
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
-# Images.
-
-GRUB_KERNEL_MACHINE_LINK_ADDR	= 0x8200
-
-ifeq ($(platform), coreboot)
-
-pkglib_PROGRAMS += kernel.img
-kernel_img_SOURCES = kern/i386/coreboot/startup.S \
-	kern/i386/misc.S \
-	kern/i386/coreboot/init.c \
-	kern/i386/multiboot_mmap.c \
-	kern/i386/halt.c \
-	kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
-	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/rtc_get_time_ms.c \
-	kern/generic/millisleep.c \
-	kern/env.c \
-	term/i386/pc/vga_text.c term/i386/vga_common.c \
-	symlist.c
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	machine/boot.h machine/console.h machine/init.h \
-	machine/memory.h machine/loader.h list.h handler.h command.h i18n.h \
-	env_private.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
-
-endif
-
-ifeq ($(platform), qemu)
-
-GRUB_BOOT_MACHINE_LINK_ADDR	= 0xffe00
-
-pkglib_IMAGES += boot.img
-boot_img_SOURCES = boot/i386/qemu/boot.S
-boot_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
-boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_BOOT_MACHINE_LINK_ADDR)
-boot_img_FORMAT = binary
-
-bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
-	util/resolve.c gnulib/progname.c
-grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-util/grub-mkrawimage.c_DEPENDENCIES = Makefile
-
-
-pkglib_IMAGES += kernel.img
-kernel_img_SOURCES = kern/i386/qemu/startup.S \
-	kern/i386/misc.S \
-	kern/i386/coreboot/init.c \
-	kern/i386/qemu/mmap.c \
-	kern/i386/halt.c \
-	kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
-	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/rtc_get_time_ms.c \
-	kern/generic/millisleep.c \
-	kern/env.c \
-	term/i386/pc/vga_text.c term/i386/vga_common.c \
-	symlist.c
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	machine/boot.h machine/console.h machine/init.h \
-	machine/memory.h machine/loader.h list.h handler.h command.h i18n.h \
-	env_private.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-kernel_img_FORMAT = binary
-endif
-
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-sbin_SCRIPTS += grub-install
-grub_install_SOURCES = util/grub-install.in
-
-bin_SCRIPTS += grub-mkrescue
-grub_mkrescue_SOURCES = util/grub-mkrescue.in
-
-# Modules.
-pkglib_MODULES = linux.mod 				\
-	aout.mod play.mod serial.mod 			\
-	memdisk.mod pci.mod lspci.mod reboot.mod	\
-	halt.mod datetime.mod date.mod datehook.mod	\
-	lsmmap.mod mmap.mod
-
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For reboot.mod.
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod.
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-serial_mod_SOURCES = term/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For aout.mod.
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bsd.mod
-pkglib_MODULES += bsd.mod
-bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
-bsd_mod_CFLAGS = $(COMMON_CFLAGS)
-bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For play.mod.
-play_mod_SOURCES = commands/i386/pc/play.c
-play_mod_CFLAGS = $(COMMON_CFLAGS)
-play_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/cmos_datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk

conf/i386-efi.rmk

@@ -1,166 +0,0 @@
-# -*- makefile -*-
-
-COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
-COMMON_CFLAGS = -fno-builtin -m32
-COMMON_LDFLAGS = -melf_i386 -nostdlib
-
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
-# Utilities.
-bin_UTILITIES = grub-mkimage
-
-# For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/i386/efi/grub-mkimage.c \
-	util/misc.c util/resolve.c
-util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
-
-# For grub-setup.
-#grub_setup_SOURCES = util/i386/pc/grub-setup.c util/hostdisk.c	\
-#	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-#	kern/err.c kern/misc.c fs/fat.c fs/ext2.c fs/xfs.c fs/affs.c	\
-#	fs/sfs.c kern/parser.c kern/partition.c partmap/msdos.c		\
-#	fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c	\
-#	kern/fs.c kern/env.c fs/fshelp.c
-
-# Scripts.
-sbin_SCRIPTS = grub-install
-
-# For grub-install.
-grub_install_SOURCES = util/i386/efi/grub-install.in
-
-# Modules.
-pkglib_PROGRAMS = kernel.img
-pkglib_MODULES = chain.mod appleldr.mod \
-	linux.mod halt.mod reboot.mod pci.mod lspci.mod \
-	datetime.mod date.mod datehook.mod loadbios.mod \
-	fixvideo.mod mmap.mod acpi.mod
-
-# For kernel.img.
-kernel_img_RELOCATABLE = yes
-kernel_img_SOURCES = kern/i386/efi/startup.S kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/$(target_cpu)/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
-	kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \
-	term/efi/console.c disk/efi/efidisk.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/rtc_get_time_ms.c \
-	kern/generic/millisleep.c
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h \
-	i18n.h env_private.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
-
-MOSTLYCLEANFILES += symlist.c
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For acpi.mod.
-acpi_mod_SOURCES = commands/acpi.c commands/efi/acpi.c
-acpi_mod_CFLAGS = $(COMMON_CFLAGS)
-acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c \
-		   mmap/efi/mmap.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For chain.mod.
-chain_mod_SOURCES = loader/efi/chainloader.c
-chain_mod_CFLAGS = $(COMMON_CFLAGS)
-chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For appleldr.mod.
-appleldr_mod_SOURCES = loader/efi/appleloader.c
-appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
-appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/efi/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod.
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For reboot.mod.
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/efi/datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loadbios.mod
-loadbios_mod_SOURCES = commands/efi/loadbios.c
-loadbios_mod_CFLAGS = $(COMMON_CFLAGS)
-loadbios_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For fixvideo.mod
-fixvideo_mod_SOURCES = commands/efi/fixvideo.c
-fixvideo_mod_CFLAGS = $(COMMON_CFLAGS)
-fixvideo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += efi_uga.mod
-efi_uga_mod_SOURCES = video/efi_uga.c
-efi_uga_mod_CFLAGS = $(COMMON_CFLAGS)
-efi_uga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += efi_gop.mod
-efi_gop_mod_SOURCES = video/efi_gop.c
-efi_gop_mod_CFLAGS = $(COMMON_CFLAGS)
-efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c \
-	loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
-xnu_mod_CFLAGS = $(COMMON_CFLAGS)
-xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk

conf/i386-ieee1275.rmk

@@ -1,145 +0,0 @@
-# -*- makefile -*-
-
-COMMON_ASFLAGS	= -m32 -nostdinc -fno-builtin
-COMMON_CFLAGS	= -ffreestanding -mrtd -mregparm=3
-COMMON_LDFLAGS	= -nostdlib
-
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
-# Images.
-pkglib_PROGRAMS = kernel.img
-
-# For kernel.img.
-kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
-	kern/i386/misc.S \
-	kern/i386/ieee1275/init.c \
-	kern/ieee1275/init.c \
-	kern/ieee1275/mmap.c \
-	kern/ieee1275/cmain.c kern/ieee1275/openfw.c \
-	kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
-	kern/env.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
-	kern/generic/millisleep.c \
-	kern/ieee1275/ieee1275.c \
-	term/ieee1275/ofconsole.c \
-	disk/ieee1275/ofdisk.c \
-	symlist.c
-kernel_img_HEADERS = cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	ieee1275/ieee1275.h machine/kernel.h machine/loader.h machine/memory.h \
-	list.h handler.h command.h i18n.h env_private.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic
-
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-# Scripts.
-sbin_SCRIPTS = grub-install
-
-# For grub-install.
-grub_install_SOURCES = util/ieee1275/grub-install.in
-
-# Modules.
-pkglib_MODULES = halt.mod reboot.mod suspend.mod		\
-	aout.mod serial.mod linux.mod		\
-	nand.mod memdisk.mod pci.mod lspci.mod datetime.mod	\
-	date.mod datehook.mod lsmmap.mod mmap.mod
-
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For aout.mod.
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For suspend.mod
-suspend_mod_SOURCES = commands/ieee1275/suspend.c
-suspend_mod_CFLAGS = $(COMMON_CFLAGS)
-suspend_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For reboot.mod
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-serial_mod_SOURCES = term/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/ieee1275/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For nand.mod.
-nand_mod_SOURCES = disk/ieee1275/nand.c
-nand_mod_CFLAGS = $(COMMON_CFLAGS)
-nand_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/cmos_datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk

conf/i386-pc-cygwin-img-ld.sc

@@ -13,17 +13,13 @@ SECTIONS
     __data_start__ = . ;
     *(.data)
     __data_end__ = . ;
-  }
-  .rdata :
-  {
     __rdata_start__ = . ;
     *(.rdata)
     __rdata_end__ = . ;
-  }
-  .pdata :
-  {
     *(.pdata)
     edata = . ;
+    _edata = . ;
+    __edata = . ;
   }
   .bss :
   {

conf/i386-pc.rmk

@@ -1,373 +0,0 @@
-# -*- makefile -*-
-
-GRUB_KERNEL_MACHINE_LINK_ADDR = 0x8200
-
-COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
-COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
-COMMON_LDFLAGS = -m32 -nostdlib
-
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
-# Images.
-pkglib_IMAGES = boot.img cdboot.img diskboot.img kernel.img lnxboot.img \
-	pxeboot.img
-
-# For boot.img.
-boot_img_SOURCES = boot/i386/pc/boot.S
-boot_img_ASFLAGS = $(COMMON_ASFLAGS)
-boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7C00
-boot_img_FORMAT = binary
-
-# For pxeboot.img
-pxeboot_img_SOURCES = boot/i386/pc/pxeboot.S
-pxeboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-pxeboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7C00
-pxeboot_img_FORMAT = binary
-
-# For diskboot.img.
-diskboot_img_SOURCES = boot/i386/pc/diskboot.S
-diskboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-diskboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x8000
-diskboot_img_FORMAT = binary
-
-# For lnxboot.img.
-lnxboot_img_SOURCES = boot/i386/pc/lnxboot.S
-lnxboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-lnxboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x6000
-lnxboot_img_FORMAT = binary
-
-# For cdboot.img.
-cdboot_img_SOURCES = boot/i386/pc/cdboot.S
-cdboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-cdboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7C00
-cdboot_img_FORMAT = binary
-
-# For kernel.img.
-kernel_img_SOURCES = kern/i386/pc/startup.S \
-	kern/i386/misc.S \
-	kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
-	kern/$(target_cpu)/dl.c kern/i386/pc/init.c kern/i386/pc/mmap.c \
-	kern/parser.c kern/partition.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/rtc_get_time_ms.c \
-	kern/generic/millisleep.c \
-	kern/env.c \
-	term/i386/pc/console.c term/i386/vga_common.c \
-	symlist.c
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	machine/biosdisk.h machine/boot.h machine/console.h machine/init.h \
-	machine/memory.h machine/loader.h machine/vga.h machine/vbe.h \
-	machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h \
-	i18n.h env_private.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
-kernel_img_FORMAT = binary
-
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-# Utilities.
-bin_UTILITIES = grub-mkimage
-sbin_UTILITIES = grub-setup
-
-# For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
-	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
-grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-util/grub-mkrawimage.c_DEPENDENCIES = Makefile
-
-# For grub-setup.
-util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h
-grub_setup_SOURCES = gnulib/progname.c \
-	util/i386/pc/grub-setup.c util/hostdisk.c	\
-	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-	kern/err.c kern/misc.c kern/parser.c kern/partition.c	\
-	kern/file.c kern/fs.c kern/env.c fs/fshelp.c		\
-	\
-	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c		\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
-	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c		\
-	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c	\
-	fs/befs.c fs/befs_be.c fs/tar.c			\
-	\
-	partmap/msdos.c partmap/gpt.c				\
-	\
-	disk/raid.c disk/mdraid_linux.c disk/lvm.c		\
-	util/raid.c util/lvm.c					\
-	grub_setup_init.c
-
-sbin_SCRIPTS += grub-install
-grub_install_SOURCES = util/grub-install.in
-
-bin_SCRIPTS += grub-mkrescue
-grub_mkrescue_SOURCES = util/grub-mkrescue.in
-
-pkglib_MODULES = biosdisk.mod chain.mod 				\
-	reboot.mod halt.mod				\
-	vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod		\
-	vga.mod memdisk.mod pci.mod lspci.mod				\
-	aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod 	\
-	datehook.mod lsmmap.mod ata_pthru.mod hdparm.mod 		\
-	usb.mod uhci.mod ohci.mod usbtest.mod usbms.mod usb_keyboard.mod \
-	efiemu.mod mmap.mod acpi.mod drivemap.mod
-
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For drivemap.mod.
-drivemap_mod_SOURCES = commands/i386/pc/drivemap.c \
-                       commands/i386/pc/drivemap_int13h.S
-drivemap_mod_ASFLAGS = $(COMMON_ASFLAGS)
-drivemap_mod_CFLAGS = $(COMMON_CFLAGS)
-drivemap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For efiemu.mod.
-efiemu_mod_SOURCES = efiemu/main.c efiemu/i386/loadcore32.c \
-		     efiemu/i386/loadcore64.c efiemu/i386/pc/cfgtables.c \
-		     efiemu/mm.c efiemu/loadcore_common.c efiemu/symbols.c \
-		     efiemu/loadcore32.c efiemu/loadcore64.c \
-		     efiemu/prepare32.c efiemu/prepare64.c efiemu/pnvram.c \
-		     efiemu/i386/coredetect.c
-efiemu_mod_CFLAGS = $(COMMON_CFLAGS)
-efiemu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For acpi.mod.
-acpi_mod_SOURCES = commands/acpi.c commands/i386/pc/acpi.c
-acpi_mod_CFLAGS = $(COMMON_CFLAGS)
-acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c \
-		   mmap/i386/pc/mmap.c mmap/i386/pc/mmap_helper.S
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For biosdisk.mod.
-biosdisk_mod_SOURCES = disk/i386/pc/biosdisk.c
-biosdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-biosdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For chain.mod.
-chain_mod_SOURCES = loader/i386/pc/chainloader.c
-chain_mod_CFLAGS = $(COMMON_CFLAGS)
-chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += linux16.mod
-linux16_mod_SOURCES = loader/i386/pc/linux.c
-linux16_mod_CFLAGS = $(COMMON_CFLAGS)
-linux16_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += linux.mod
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/pc/xnu.c \
-	 loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
-xnu_mod_CFLAGS = $(COMMON_CFLAGS)
-xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For reboot.mod.
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod.
-halt_mod_SOURCES = commands/i386/pc/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-serial_mod_SOURCES = term/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For vbe.mod.
-vbe_mod_SOURCES = video/i386/pc/vbe.c
-vbe_mod_CFLAGS = $(COMMON_CFLAGS)
-vbe_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For vbeinfo.mod.
-vbeinfo_mod_SOURCES = commands/i386/pc/vbeinfo.c
-vbeinfo_mod_CFLAGS = $(COMMON_CFLAGS)
-vbeinfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For vbetest.mod.
-vbetest_mod_SOURCES = commands/i386/pc/vbetest.c
-vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
-vbetest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For play.mod.
-play_mod_SOURCES = commands/i386/pc/play.c
-play_mod_CFLAGS = $(COMMON_CFLAGS)
-play_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For vga.mod.
-vga_mod_SOURCES = term/i386/pc/vga.c
-vga_mod_CFLAGS = $(COMMON_CFLAGS)
-vga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For aout.mod
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bsd.mod
-bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
-bsd_mod_CFLAGS = $(COMMON_CFLAGS)
-bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For usb.mod
-usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
-usb_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbtest.mod
-usbtest_mod_SOURCES = commands/usbtest.c
-usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
-usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For uhci.mod
-uhci_mod_SOURCES = bus/usb/uhci.c
-uhci_mod_CFLAGS = $(COMMON_CFLAGS)
-uhci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ohci.mod
-ohci_mod_SOURCES = bus/usb/ohci.c
-ohci_mod_CFLAGS = $(COMMON_CFLAGS)
-ohci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbms.mod
-usbms_mod_SOURCES = disk/usbms.c
-usbms_mod_CFLAGS = $(COMMON_CFLAGS)
-usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usb_keyboard.mod
-usb_keyboard_mod_SOURCES = term/usb_keyboard.c
-usb_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pxe.mod
-pxe_mod_SOURCES = fs/i386/pc/pxe.c
-pxe_mod_CFLAGS = $(COMMON_CFLAGS)
-pxe_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pxecmd.mod
-pxecmd_mod_SOURCES = commands/i386/pc/pxecmd.c
-pxecmd_mod_CFLAGS = $(COMMON_CFLAGS)
-pxecmd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/cmos_datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ata_pthru.mod.
-ata_pthru_mod_SOURCES = disk/ata_pthru.c
-ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_pthru_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hdparm.mod.
-hdparm_mod_SOURCES = commands/hdparm.c lib/hexdump.c
-hdparm_mod_CFLAGS = $(COMMON_CFLAGS)
-hdparm_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-ifeq ($(enable_efiemu), yes)
-
-efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
-	-rm -f $@
-ifeq ($(TARGET_APPLE_CC), 1)
-	-rm -f $@.bin
-	$(TARGET_CC) -c -m32 -DELF32 -DAPPLE_CC -o $@.bin -Wall -Werror $< -nostdlib -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-	$(OBJCONV) -felf32 -nu -nd $@.bin $@
-	-rm -f $@.bin
-else
-	$(TARGET_CC) -c -m32 -DELF32 -o $@ -Wall -Werror $< -nostdlib -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-	if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
-endif
-
-efiemu64_c.o: efiemu/runtime/efiemu.c
-ifeq ($(TARGET_APPLE_CC), 1)
-	$(TARGET_CC) -c -m64 -DAPPLE_CC=1 -DELF64 -o $@ -Wall -Werror $< -nostdlib -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-else
-	$(TARGET_CC) -c -m64 -DELF64 -o $@ -Wall -Werror $< -nostdlib  -mcmodel=large -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-endif
-
-efiemu64_s.o: efiemu/runtime/efiemu.S
-	-rm -f $@
-ifeq ($(TARGET_APPLE_CC), 1)
-	$(TARGET_CC) -c -m64 -DAPPLE_CC=1 -DELF64 -o $@ -Wall -Werror $< -nostdlib -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-else
-	$(TARGET_CC) -c -m64 -DELF64 -o $@ -Wall -Werror $< -nostdlib  -mcmodel=large -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-endif
-
-efiemu64.o: efiemu64_c.o efiemu64_s.o  $(TARGET_OBJ2ELF)
-	-rm -f $@
-ifeq ($(TARGET_APPLE_CC), 1)
-	-rm -f $@.bin
-	$(TARGET_CC) -m64 -o $@.bin -Wl,-r $^ -nostdlib
-	$(OBJCONV) -felf64 -nu -nd $@.bin $@
-	-rm -f $@.bin
-else
-	$(TARGET_CC) -m64 -o $@ -Wl,-r $^ -nostdlib
-	if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
-endif
-
-CLEANFILES += efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o
-pkglib_DATA += efiemu32.o efiemu64.o
-
-endif
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk

conf/i386-qemu.rmk

@@ -1,2 +0,0 @@
-# -*- makefile -*-
-include $(srcdir)/conf/i386-coreboot.mk

conf/i386.rmk

@@ -1,49 +0,0 @@
-# -*- makefile -*-
-
-pkglib_MODULES += cpuid.mod
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += at_keyboard.mod
-at_keyboard_mod_SOURCES = term/at_keyboard.c
-at_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
-at_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += vga_text.mod
-vga_text_mod_SOURCES = term/i386/pc/vga_text.c term/i386/vga_common.c
-vga_text_mod_CFLAGS = $(COMMON_CFLAGS)
-vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += relocator.mod
-relocator_mod_SOURCES = lib/i386/relocator.c lib/i386/relocator_asm.S lib/i386/relocator_backward.S
-relocator_mod_CFLAGS = $(COMMON_CFLAGS)
-relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
-relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += ata.mod
-ata_mod_SOURCES = disk/ata.c
-ata_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For setpci.mod
-pkglib_MODULES += setpci.mod
-setpci_mod_SOURCES = commands/setpci.c
-setpci_mod_CFLAGS = $(COMMON_CFLAGS)
-setpci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += multiboot.mod
-multiboot_mod_SOURCES = loader/i386/multiboot.c \
-			loader/i386/multiboot_mbi.c \
-                        loader/multiboot_loader.c
-multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
-multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-multiboot_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-pkglib_MODULES += multiboot2.mod
-multiboot2_mod_SOURCES = loader/i386/multiboot.c \
-			 loader/i386/multiboot_mbi.c \
-                         loader/multiboot_loader.c
-multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
-multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)

conf/mips-qemu-mips.rmk

@@ -1,23 +0,0 @@
-# -*- makefile -*-
-LINK_BASE = 0x80010000
-target_machine=qemu-mips
-COMMON_CFLAGS += -march=mips3
-COMMON_ASFLAGS += -march=mips3
-include $(srcdir)/conf/mips.mk
-
-pkglib_IMAGES = kernel.img
-kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
-	kern/main.c kern/device.c kern/$(target_cpu)/init.c \
-	kern/$(target_cpu)/$(target_machine)/init.c 		\
-	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
-	kern/misc.c kern/mm.c kern/term.c 	\
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
-	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
-	kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c kern/time.c    \
-	symlist.c kern/$(target_cpu)/cache.S
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
-	-Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
-kernel_img_FORMAT = binary

conf/mips-yeeloong.rmk

@@ -1,87 +0,0 @@
-# -*- makefile -*-
-LINK_BASE = 0x80200000
-target_machine=yeeloong
-COMMON_CFLAGS += -march=mips3
-COMMON_ASFLAGS += -march=mips3
-
-kernel_img_HEADERS += bitmap.h video.h gfxterm.h font.h bitmap_scale.h bufio.h
-
-include $(srcdir)/conf/mips.mk
-
-pkglib_IMAGES = kernel.img
-kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
-	kern/main.c kern/device.c kern/$(target_cpu)/init.c \
-	kern/$(target_cpu)/$(target_machine)/init.c 		\
-	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
-	kern/misc.c kern/mm.c kern/term.c 	\
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
-	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
-	kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c kern/time.c    \
-	kern/$(target_cpu)/cache.S \
-	\
-	term/at_keyboard.c \
-	font/font_cmd.c font/font.c io/bufio.c \
-	video/video.c video/fb/video_fb.c video/fb/fbblit.c \
-	video/fb/fbfill.c video/fb/fbutil.c video/bitmap.c \
-	video/bitmap_scale.c video/sm712.c bus/pci.c bus/bonito.c \
-	term/gfxterm.c commands/extcmd.c lib/arg.c \
-	symlist.c
-kernel_img_CFLAGS = $(COMMON_CFLAGS) -DUSE_ASCII_FAILBACK
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
-	-Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
-kernel_img_FORMAT = binary
-
-# For ata.mod.
-pkglib_MODULES += ata.mod
-ata_mod_SOURCES = disk/ata.c
-ata_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-pkglib_MODULES += lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ata_pthru.mod.
-pkglib_MODULES += ata_pthru.mod
-ata_pthru_mod_SOURCES = disk/ata_pthru.c
-ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_pthru_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mmap.mod.
-pkglib_MODULES += mmap.mod
-mmap_mod_SOURCES = mmap/mmap.c mmap/mips/yeeloong/uppermem.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For datetime.mod
-pkglib_MODULES += datetime.mod
-datetime_mod_SOURCES = lib/cmos_datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For date.mod
-pkglib_MODULES += date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-pkglib_MODULES += datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += linux.mod
-linux_mod_SOURCES = loader/$(target_cpu)/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-sbin_SCRIPTS += grub-install
-grub_install_SOURCES = util/grub-install.in
-

conf/mips.rmk

@@ -1,76 +0,0 @@
-
-# -*- makefile -*-
-
-COMMON_ASFLAGS += -nostdinc
-COMMON_CFLAGS += -ffreestanding -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
-COMMON_LDFLAGS += -nostdlib
-
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
-# Images.
-
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-kernel_img_HEADERS += boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
-	symbol.h term.h time.h types.h loader.h partition.h \
-	msdos_partition.h machine/kernel.h handler.h list.h \
-	command.h machine/memory.h cpu/libgcc.h cpu/cache.h i18n.h env_private.h
-
-ifeq ($(platform), yeeloong)
-kernel_img_HEADERS += pci.h
-endif
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-# Scripts.
-sbin_SCRIPTS = 
-bin_SCRIPTS = 
-
-# For grub-mkimage.
-bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
-	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
-grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(LINK_BASE)
-util/grub-mkrawimage.c_DEPENDENCIES = Makefile
-
-# Modules.
-pkglib_MODULES = memdisk.mod \
-	lsmmap.mod
-
-# For boot.mod.
-pkglib_MODULES += boot.mod 
-boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-pkglib_MODULES += serial.mod
-serial_mod_SOURCES = term/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For relocator.mod.
-pkglib_MODULES += relocator.mod
-relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/$(target_cpu)/relocator_asm.S
-relocator_mod_CFLAGS = $(COMMON_CFLAGS)
-relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
-relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-include $(srcdir)/conf/common.mk

conf/powerpc-ieee1275.rmk

@@ -1,103 +0,0 @@
-
-# -*- makefile -*-
-
-COMMON_ASFLAGS = -nostdinc -D__ASSEMBLY__
-COMMON_CFLAGS = -ffreestanding
-COMMON_LDFLAGS += -nostdlib
-
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
-# Images.
-
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
-	symbol.h term.h time.h types.h powerpc/libgcc.h loader.h partition.h \
-	msdos_partition.h ieee1275/ieee1275.h machine/kernel.h handler.h list.h \
-	command.h i18n.h env_private.h
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-# Programs
-pkglib_PROGRAMS = kernel.img
-
-kernel_img_SOURCES = kern/powerpc/ieee1275/startup.S kern/ieee1275/cmain.c \
-	kern/ieee1275/ieee1275.c kern/main.c kern/device.c 		\
-	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
-	kern/misc.c kern/mm.c kern/term.c 	\
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
-	kern/ieee1275/init.c 						\
-	kern/ieee1275/mmap.c						\
-	term/ieee1275/ofconsole.c 		\
-	kern/ieee1275/openfw.c disk/ieee1275/ofdisk.c 		\
-	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
-	kern/generic/millisleep.c kern/time.c                            \
-	symlist.c kern/$(target_cpu)/cache.S
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
-	-Wl,-N,-S,-Ttext,0x200000,-Bstatic
-
-# Scripts.
-sbin_SCRIPTS = grub-install
-bin_SCRIPTS = grub-mkrescue
-
-# For grub-install.
-grub_install_SOURCES = util/ieee1275/grub-install.in
-
-# For grub-mkrescue.
-grub_mkrescue_SOURCES = util/powerpc/ieee1275/grub-mkrescue.in
-
-# Modules.
-pkglib_MODULES = halt.mod \
-	linux.mod \
-	reboot.mod \
-	suspend.mod \
-	memdisk.mod \
-	lsmmap.mod
-
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/powerpc/ieee1275/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For suspend.mod
-suspend_mod_SOURCES = commands/ieee1275/suspend.c
-suspend_mod_CFLAGS = $(COMMON_CFLAGS)
-suspend_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For reboot.mod
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-include $(srcdir)/conf/common.mk

conf/sparc64-ieee1275.rmk

@@ -1,136 +0,0 @@
-
-# -*- makefile -*-
-
-COMMON_ASFLAGS = -nostdinc -m64
-COMMON_CFLAGS = -ffreestanding -m64 -mno-app-regs
-COMMON_LDFLAGS = -melf64_sparc -nostdlib -mno-relax
-
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
-# Images.
-pkglib_IMAGES = boot.img diskboot.img kernel.img
-
-# For boot.img.
-boot_img_SOURCES = boot/sparc64/ieee1275/boot.S
-boot_img_ASFLAGS = $(COMMON_ASFLAGS)
-boot_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-Ttext,0x4000
-boot_img_FORMAT = a.out-sunos-big
-
-# For diskboot.img.
-diskboot_img_SOURCES = boot/sparc64/ieee1275/diskboot.S
-diskboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-diskboot_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-Ttext,0x4200
-diskboot_img_FORMAT = binary
-
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	list.h handler.h command.h i18n.h \
-	sparc64/libgcc.h ieee1275/ieee1275.h machine/kernel.h \
-	sparc64/ieee1275/ieee1275.h env_private.h
-kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c	\
-	kern/ieee1275/ieee1275.c kern/main.c kern/device.c		\
-	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c		\
-	kern/misc.c kern/mm.c kern/term.c			\
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
-	kern/sparc64/ieee1275/ieee1275.c 				\
-	kern/sparc64/ieee1275/init.c 					\
-	kern/ieee1275/mmap.c						\
-	term/ieee1275/ofconsole.c 					\
-	kern/ieee1275/openfw.c disk/ieee1275/ofdisk.c 			\
-	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c	\
-	kern/generic/millisleep.c kern/time.c				\
-	symlist.c kern/$(target_cpu)/cache.S
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc -static-libgcc -lgcc
-kernel_img_FORMAT = binary
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-# Utilities.
-bin_UTILITIES = grub-mkimage
-sbin_UTILITIES = grub-setup grub-ofpathname
-
-# For grub-mkimage.
-grub_mkimage_SOURCES = util/sparc64/ieee1275/grub-mkimage.c util/misc.c \
-        util/resolve.c gnulib/progname.c
-
-# For grub-setup.
-util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h
-grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
-	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-	kern/err.c kern/misc.c kern/parser.c kern/partition.c	\
-	kern/file.c kern/fs.c kern/env.c fs/fshelp.c		\
-	\
-	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c		\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
-	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c		\
-	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c	\
-	fs/befs.c fs/befs_be.c fs/tar.c			\
-	\
-	partmap/amiga.c	partmap/apple.c partmap/msdos.c		\
-	partmap/sun.c partmap/acorn.c				\
-	\
-	disk/raid.c disk/mdraid_linux.c disk/lvm.c		\
-	util/raid.c util/lvm.c gnulib/progname.c		\
-	grub_setup_init.c
-
-# For grub-ofpathname.
-grub_ofpathname_SOURCES = util/sparc64/ieee1275/grub-ofpathname.c \
-	util/ieee1275/ofpath.c util/misc.c gnulib/progname.c
-
-# Scripts.
-sbin_SCRIPTS = grub-install
-
-# For grub-install.
-grub_install_SOURCES = util/grub-install.in
-
-# Modules.
-pkglib_MODULES = halt.mod \
-	linux.mod \
-	reboot.mod \
-	memdisk.mod \
-	lsmmap.mod
-
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/sparc64/ieee1275/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For reboot.mod.
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod.
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-include $(srcdir)/conf/common.mk

conf/tests.rmk

@@ -1,50 +0,0 @@
-# -*- makefile -*-
-
-# For grub-shell
-grub-shell: tests/util/grub-shell.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-check_SCRIPTS += grub-shell
-CLEANFILES += grub-shell
-
-# For grub-shell-tester
-grub-shell-tester: tests/util/grub-shell-tester.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-check_SCRIPTS += grub-shell-tester
-CLEANFILES += grub-shell-tester
-
-pkglib_MODULES += functional_test.mod
-functional_test_mod_SOURCES = tests/lib/functional_test.c tests/lib/test.c
-functional_test_mod_CFLAGS  = $(COMMON_CFLAGS)
-functional_test_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Rules for unit tests
-check_UTILITIES += example_unit_test
-example_unit_test_SOURCES = tests/example_unit_test.c kern/list.c kern/misc.c tests/lib/test.c tests/lib/unit_test.c
-example_unit_test_CFLAGS  = -Wno-format
-
-# Rules for functional tests
-pkglib_MODULES += example_functional_test.mod
-example_functional_test_mod_SOURCES = tests/example_functional_test.c
-example_functional_test_mod_CFLAGS  = -Wno-format $(COMMON_CFLAGS)
-example_functional_test_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Rules for scripted tests
-check_SCRIPTS += example_scripted_test
-example_scripted_test_SOURCES = tests/example_scripted_test.in
-
-check_SCRIPTS += example_grub_script_test
-example_grub_script_test_SOURCES = tests/example_grub_script_test.in
-
-
-# List of tests to execute on "make check"
-SCRIPTED_TESTS    = example_scripted_test
-SCRIPTED_TESTS   += example_grub_script_test
-UNIT_TESTS        = example_unit_test
-FUNCTIONAL_TESTS  = example_functional_test.mod
-
-# dependencies between tests and testing-tools
-$(SCRIPTED_TESTS): grub-shell grub-shell-tester
-$(FUNCTIONAL_TESTS): functional_test.mod
-

conf/x86_64-efi.rmk

@@ -1,166 +0,0 @@
-# -*- makefile -*-
-
-COMMON_ASFLAGS = -nostdinc -fno-builtin -m64
-COMMON_CFLAGS = -fno-builtin -m64
-COMMON_LDFLAGS = -melf_x86_64 -nostdlib
-
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
-# Utilities.
-bin_UTILITIES = grub-mkimage
-
-# For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/i386/efi/grub-mkimage.c \
-	util/misc.c util/resolve.c
-
-# For grub-setup.
-#grub_setup_SOURCES = util/i386/pc/grub-setup.c util/hostdisk.c	\
-#	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-#	kern/err.c kern/misc.c fs/fat.c fs/ext2.c fs/xfs.c fs/affs.c	\
-#	fs/sfs.c kern/parser.c kern/partition.c partmap/msdos.c		\
-#	fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c	\
-#	kern/fs.c kern/env.c fs/fshelp.c
-
-# Scripts.
-sbin_SCRIPTS = grub-install
-
-# For grub-install.
-grub_install_SOURCES = util/i386/efi/grub-install.in
-
-# Modules.
-pkglib_PROGRAMS = kernel.img
-pkglib_MODULES = chain.mod appleldr.mod 	\
-	halt.mod reboot.mod linux.mod pci.mod lspci.mod \
-	datetime.mod date.mod datehook.mod loadbios.mod \
-	fixvideo.mod mmap.mod acpi.mod
-
-# For kernel.img.
-kernel_img_RELOCATABLE = yes
-kernel_img_SOURCES = kern/x86_64/efi/startup.S kern/x86_64/efi/callwrap.S \
-	kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/$(target_cpu)/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
-	kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c \
-	term/efi/console.c disk/efi/efidisk.c
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	efi/efi.h efi/time.h efi/disk.h machine/loader.h i386/pit.h list.h \
-	handler.h command.h i18n.h env_private.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
-
-MOSTLYCLEANFILES += symlist.c
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For acpi.mod.
-acpi_mod_SOURCES = commands/acpi.c commands/efi/acpi.c
-acpi_mod_CFLAGS = $(COMMON_CFLAGS)
-acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c \
-		   mmap/efi/mmap.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For chain.mod.
-chain_mod_SOURCES = loader/efi/chainloader.c
-chain_mod_CFLAGS = $(COMMON_CFLAGS)
-chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For appleldr.mod.
-appleldr_mod_SOURCES = loader/efi/appleloader.c
-appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
-appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/efi/linux.c loader/i386/linux_trampoline.S
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod.
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For reboot.mod.
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/efi/datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loadbios.mod
-loadbios_mod_SOURCES = commands/efi/loadbios.c
-loadbios_mod_CFLAGS = $(COMMON_CFLAGS)
-loadbios_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For fixvideo.mod
-fixvideo_mod_SOURCES = commands/efi/fixvideo.c
-fixvideo_mod_CFLAGS = $(COMMON_CFLAGS)
-fixvideo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += efi_uga.mod
-efi_uga_mod_SOURCES = video/efi_uga.c
-efi_uga_mod_CFLAGS = $(COMMON_CFLAGS)
-efi_uga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += efi_gop.mod
-efi_gop_mod_SOURCES = video/efi_gop.c
-efi_gop_mod_CFLAGS = $(COMMON_CFLAGS)
-efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c \
-	loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
-xnu_mod_CFLAGS = $(COMMON_CFLAGS)
-xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk

config.h.in

@@ -0,0 +1,67 @@
+#undef _LARGEFILE_SOURCE
+#undef _FILE_OFFSET_BITS
+#define _LARGEFILE_SOURCE
+#define _FILE_OFFSET_BITS 64
+#if defined(__PPC__) && !defined(__powerpc__)
+#define __powerpc__ 1
+#endif
+
+#define GCRYPT_NO_DEPRECATED 1
+
+/* Define to 1 to enable disk cache statistics.  */
+#define DISK_CACHE_STATS @DISK_CACHE_STATS@
+#define BOOT_TIME_STATS @BOOT_TIME_STATS@
+
+#if defined (GRUB_BUILD)
+#undef ENABLE_NLS
+#define BUILD_SIZEOF_LONG @BUILD_SIZEOF_LONG@
+#define BUILD_SIZEOF_VOID_P @BUILD_SIZEOF_VOID_P@
+#if defined __APPLE__
+# if defined __BIG_ENDIAN__
+#  define BUILD_WORDS_BIGENDIAN 1
+# else
+#  define BUILD_WORDS_BIGENDIAN 0
+# endif
+#else
+#define BUILD_WORDS_BIGENDIAN @BUILD_WORDS_BIGENDIAN@
+#endif
+#elif defined (GRUB_UTIL) || !defined (GRUB_MACHINE)
+#include <config-util.h>
+#else
+/* 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.  */
+#define END_SYMBOL @END_SYMBOL@
+/* Name of package.  */
+#define PACKAGE "@PACKAGE@"
+/* Version number of package.  */
+#define VERSION "@VERSION@"
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "@PACKAGE_STRING@"
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "@PACKAGE_VERSION@"
+/* Define to the full name of this package. */
+#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 _GNU_SOURCE 1
+
+#endif

disk/ata.c

@@ -1,894 +0,0 @@
-/* ata.c - ATA disk access.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2007, 2008, 2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/ata.h>
-#include <grub/dl.h>
-#include <grub/disk.h>
-#include <grub/mm.h>
-#include <grub/time.h>
-#include <grub/pci.h>
-#include <grub/scsi.h>
-
-/* At the moment, only two IDE ports are supported.  */
-static const grub_port_t grub_ata_ioaddress[] = { 0x1f0, 0x170 };
-static const grub_port_t grub_ata_ioaddress2[] = { 0x3f6, 0x376 };
-
-static struct grub_ata_device *grub_ata_devices;
-
-/* Wait for !BSY.  */
-grub_err_t
-grub_ata_wait_not_busy (struct grub_ata_device *dev, int milliseconds)
-{
-  /* ATA requires 400ns (after a write to CMD register) or
-     1 PIO cycle (after a DRQ block transfer) before
-     first check of BSY.  */
-  grub_millisleep (1);
-
-  int i = 1;
-  grub_uint8_t sts;
-  while ((sts = grub_ata_regget (dev, GRUB_ATA_REG_STATUS))
-	 & GRUB_ATA_STATUS_BUSY)
-    {
-      if (i >= milliseconds)
-        {
-	  grub_dprintf ("ata", "timeout: %dms, status=0x%x\n",
-			milliseconds, sts);
-	  return grub_error (GRUB_ERR_TIMEOUT, "ATA timeout");
-	}
-
-      grub_millisleep (1);
-      i++;
-    }
-
-  return GRUB_ERR_NONE;
-}
-
-static inline void
-grub_ata_wait (void)
-{
-  grub_millisleep (50);
-}
-
-/* Wait for !BSY, DRQ.  */
-grub_err_t
-grub_ata_wait_drq (struct grub_ata_device *dev, int rw,
-		   int milliseconds)
-{
-  if (grub_ata_wait_not_busy (dev, milliseconds))
-    return grub_errno;
-
-  /* !DRQ implies error condition.  */
-  grub_uint8_t sts = grub_ata_regget (dev, GRUB_ATA_REG_STATUS);
-  if ((sts & (GRUB_ATA_STATUS_DRQ | GRUB_ATA_STATUS_ERR))
-      != GRUB_ATA_STATUS_DRQ)
-    {
-      grub_dprintf ("ata", "ata error: status=0x%x, error=0x%x\n",
-		    sts, grub_ata_regget (dev, GRUB_ATA_REG_ERROR));
-      if (! rw)
-        return grub_error (GRUB_ERR_READ_ERROR, "ATA read error");
-      else
-        return grub_error (GRUB_ERR_WRITE_ERROR, "ATA write error");
-    }
-
-  return GRUB_ERR_NONE;
-}
-
-/* Byteorder has to be changed before strings can be read.  */
-static void
-grub_ata_strncpy (char *dst, char *src, grub_size_t len)
-{
-  grub_uint16_t *src16 = (grub_uint16_t *) src;
-  grub_uint16_t *dst16 = (grub_uint16_t *) dst;
-  unsigned int i;
-
-  for (i = 0; i < len / 2; i++)
-    *(dst16++) = grub_be_to_cpu16 (*(src16++));
-  dst[len] = '\0';
-}
-
-void
-grub_ata_pio_read (struct grub_ata_device *dev, char *buf, grub_size_t size)
-{
-  grub_uint16_t *buf16 = (grub_uint16_t *) buf;
-  unsigned int i;
-
-  /* Read in the data, word by word.  */
-  for (i = 0; i < size / 2; i++)
-    buf16[i] = grub_le_to_cpu16 (grub_inw(dev->ioaddress + GRUB_ATA_REG_DATA));
-}
-
-static void
-grub_ata_pio_write (struct grub_ata_device *dev, char *buf, grub_size_t size)
-{
-  grub_uint16_t *buf16 = (grub_uint16_t *) buf;
-  unsigned int i;
-
-  /* Write the data, word by word.  */
-  for (i = 0; i < size / 2; i++)
-    grub_outw(grub_cpu_to_le16 (buf16[i]), dev->ioaddress + GRUB_ATA_REG_DATA);
-}
-
-static void
-grub_ata_dumpinfo (struct grub_ata_device *dev, char *info)
-{
-  char text[41];
-
-  /* The device information was read, dump it for debugging.  */
-  grub_ata_strncpy (text, info + 20, 20);
-  grub_dprintf ("ata", "Serial: %s\n", text);
-  grub_ata_strncpy (text, info + 46, 8);
-  grub_dprintf ("ata", "Firmware: %s\n", text);
-  grub_ata_strncpy (text, info + 54, 40);
-  grub_dprintf ("ata", "Model: %s\n", text);
-
-  if (! dev->atapi)
-    {
-      grub_dprintf ("ata", "Addressing: %d\n", dev->addr);
-      grub_dprintf ("ata", "Sectors: %lld\n", (unsigned long long) dev->size);
-    }
-}
-
-static grub_err_t
-grub_atapi_identify (struct grub_ata_device *dev)
-{
-  char *info;
-
-  info = grub_malloc (GRUB_DISK_SECTOR_SIZE);
-  if (! info)
-    return grub_errno;
-
-  grub_ata_regset (dev, GRUB_ATA_REG_DISK, 0xE0 | dev->device << 4);
-  grub_ata_wait ();
-  if (grub_ata_check_ready (dev))
-    {
-      grub_free (info);
-      return grub_errno;
-    }
-
-  grub_ata_regset (dev, GRUB_ATA_REG_CMD, GRUB_ATA_CMD_IDENTIFY_PACKET_DEVICE);
-  grub_ata_wait ();
-
-  if (grub_ata_wait_drq (dev, 0, GRUB_ATA_TOUT_STD))
-    {
-      grub_free (info);
-      return grub_errno;
-    }
-  grub_ata_pio_read (dev, info, GRUB_DISK_SECTOR_SIZE);
-
-  dev->atapi = 1;
-
-  grub_ata_dumpinfo (dev, info);
-
-  grub_free (info);
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_atapi_wait_drq (struct grub_ata_device *dev,
-		     grub_uint8_t ireason,
-		     int milliseconds)
-{
-  /* Wait for !BSY, DRQ, ireason */
-  if (grub_ata_wait_not_busy (dev, milliseconds))
-    return grub_errno;
-
-  grub_uint8_t sts = grub_ata_regget (dev, GRUB_ATA_REG_STATUS);
-  grub_uint8_t irs = grub_ata_regget (dev, GRUB_ATAPI_REG_IREASON);
-
-  /* OK if DRQ is asserted and interrupt reason is as expected.  */
-  if ((sts & GRUB_ATA_STATUS_DRQ)
-      && (irs & GRUB_ATAPI_IREASON_MASK) == ireason)
-    return GRUB_ERR_NONE;
-
-  /* !DRQ implies error condition.  */
-  grub_dprintf ("ata", "atapi error: status=0x%x, ireason=0x%x, error=0x%x\n",
-	        sts, irs, grub_ata_regget (dev, GRUB_ATA_REG_ERROR));
-
-  if (! (sts & GRUB_ATA_STATUS_DRQ)
-      && (irs & GRUB_ATAPI_IREASON_MASK) == GRUB_ATAPI_IREASON_ERROR)
-    {
-      if (ireason == GRUB_ATAPI_IREASON_CMD_OUT)
-	return grub_error (GRUB_ERR_READ_ERROR, "ATA PACKET command error");
-      else
-	return grub_error (GRUB_ERR_READ_ERROR, "ATAPI read error");
-    }
-
-  return grub_error (GRUB_ERR_READ_ERROR, "ATAPI protocol error");
-}
-
-static grub_err_t
-grub_atapi_packet (struct grub_ata_device *dev, char *packet,
-		   grub_size_t size)
-{
-  grub_ata_regset (dev, GRUB_ATA_REG_DISK, dev->device << 4);
-  if (grub_ata_check_ready (dev))
-    return grub_errno;
-
-  /* Send ATA PACKET command.  */
-  grub_ata_regset (dev, GRUB_ATA_REG_FEATURES, 0);
-  grub_ata_regset (dev, GRUB_ATAPI_REG_IREASON, 0);
-  grub_ata_regset (dev, GRUB_ATAPI_REG_CNTHIGH, size >> 8);
-  grub_ata_regset (dev, GRUB_ATAPI_REG_CNTLOW, size & 0xFF);
-
-  grub_ata_regset (dev, GRUB_ATA_REG_CMD, GRUB_ATA_CMD_PACKET);
-
-  /* Wait for !BSY, DRQ, !I/O, C/D.  */
-  if (grub_atapi_wait_drq (dev, GRUB_ATAPI_IREASON_CMD_OUT, GRUB_ATA_TOUT_STD))
-    return grub_errno;
-
-  /* Write the packet.  */
-  grub_ata_pio_write (dev, packet, 12);
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_ata_identify (struct grub_ata_device *dev)
-{
-  char *info;
-  grub_uint16_t *info16;
-
-  info = grub_malloc (GRUB_DISK_SECTOR_SIZE);
-  if (! info)
-    return grub_errno;
-
-  info16 = (grub_uint16_t *) info;
-
-  grub_ata_regset (dev, GRUB_ATA_REG_DISK, 0xE0 | dev->device << 4);
-  grub_ata_wait ();
-  if (grub_ata_check_ready (dev))
-    {
-      grub_free (info);
-      return grub_errno;
-    }
-
-  grub_ata_regset (dev, GRUB_ATA_REG_CMD, GRUB_ATA_CMD_IDENTIFY_DEVICE);
-  grub_ata_wait ();
-
-  if (grub_ata_wait_drq (dev, 0, GRUB_ATA_TOUT_STD))
-    {
-      grub_free (info);
-      grub_errno = GRUB_ERR_NONE;
-      grub_uint8_t sts = grub_ata_regget (dev, GRUB_ATA_REG_STATUS);
-
-      if ((sts & (GRUB_ATA_STATUS_BUSY | GRUB_ATA_STATUS_DRQ
-	  | GRUB_ATA_STATUS_ERR)) == GRUB_ATA_STATUS_ERR
-	  && (grub_ata_regget (dev, GRUB_ATA_REG_ERROR) & 0x04 /* ABRT */))
-	/* Device without ATA IDENTIFY, try ATAPI.  */
-	return grub_atapi_identify (dev);
-
-      else if (sts == 0x00)
-	/* No device, return error but don't print message.  */
-	return GRUB_ERR_UNKNOWN_DEVICE;
-
-      else
-	/* Other Error.  */
-	return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
-			   "device cannot be identified");
-    }
-
-  grub_ata_pio_read (dev, info, GRUB_DISK_SECTOR_SIZE);
-
-  /* Re-check status to avoid bogus identify data due to stuck DRQ.  */
-  grub_uint8_t sts = grub_ata_regget (dev, GRUB_ATA_REG_STATUS);
-  if (sts & (GRUB_ATA_STATUS_BUSY | GRUB_ATA_STATUS_DRQ | GRUB_ATA_STATUS_ERR))
-    {
-      grub_dprintf ("ata", "bad status=0x%x\n", sts);
-      grub_free (info);
-      /* No device, return error but don't print message.  */
-      grub_errno = GRUB_ERR_NONE;
-      return GRUB_ERR_UNKNOWN_DEVICE;
-    }
-
-  /* Now it is certain that this is not an ATAPI device.  */
-  dev->atapi = 0;
-
-  /* CHS is always supported.  */
-  dev->addr = GRUB_ATA_CHS;
-
-  /* Check if LBA is supported.  */
-  if (info16[49] & (1 << 9))
-    {
-      /* Check if LBA48 is supported.  */
-      if (info16[83] & (1 << 10))
-	dev->addr = GRUB_ATA_LBA48;
-      else
-	dev->addr = GRUB_ATA_LBA;
-    }
-
-  /* Determine the amount of sectors.  */
-  if (dev->addr != GRUB_ATA_LBA48)
-    dev->size = grub_le_to_cpu32(*((grub_uint32_t *) &info16[60]));
-  else
-    dev->size = grub_le_to_cpu64(*((grub_uint64_t *) &info16[100]));
-
-  /* Read CHS information.  */
-  dev->cylinders = info16[1];
-  dev->heads = info16[3];
-  dev->sectors_per_track = info16[6];
-
-  grub_ata_dumpinfo (dev, info);
-
-  grub_free(info);
-
-  return 0;
-}
-
-static grub_err_t
-grub_ata_device_initialize (int port, int device, int addr, int addr2)
-{
-  struct grub_ata_device *dev;
-  struct grub_ata_device **devp;
-
-  grub_dprintf ("ata", "detecting device %d,%d (0x%x, 0x%x)\n",
-		port, device, addr, addr2);
-
-  dev = grub_malloc (sizeof(*dev));
-  if (! dev)
-    return grub_errno;
-
-  /* Setup the device information.  */
-  dev->port = port;
-  dev->device = device;
-  dev->ioaddress = addr + GRUB_MACHINE_PCI_IO_BASE;
-  dev->ioaddress2 = addr2 + GRUB_MACHINE_PCI_IO_BASE;
-  dev->next = NULL;
-
-  grub_ata_regset (dev, GRUB_ATA_REG_DISK, dev->device << 4);
-  grub_ata_wait ();
-
-  /* Try to detect if the port is in use by writing to it,
-     waiting for a while and reading it again.  If the value
-     was preserved, there is a device connected.  */
-  grub_ata_regset (dev, GRUB_ATA_REG_SECTORS, 0x5A);
-  grub_ata_wait ();
-  grub_uint8_t sec = grub_ata_regget (dev, GRUB_ATA_REG_SECTORS);
-  grub_dprintf ("ata", "sectors=0x%x\n", sec);
-  if (sec != 0x5A)
-    {
-      grub_free(dev);
-      return 0;
-    }
-
-  /* The above test may detect a second (slave) device
-     connected to a SATA controller which supports only one
-     (master) device.  It is not safe to use the status register
-     READY bit to check for controller channel existence.  Some
-     ATAPI commands (RESET, DIAGNOSTIC) may clear this bit.  */
-
-  /* Use the IDENTIFY DEVICE command to query the device.  */
-  if (grub_ata_identify (dev))
-    {
-      grub_free (dev);
-      return 0;
-    }
-
-  /* Register the device.  */
-  for (devp = &grub_ata_devices; *devp; devp = &(*devp)->next);
-  *devp = dev;
-
-  return 0;
-}
-
-static int NESTED_FUNC_ATTR
-grub_ata_pciinit (grub_pci_device_t dev,
-		  grub_pci_id_t pciid)
-{
-  static int compat_use[2] = { 0 };
-  grub_pci_address_t addr;
-  grub_uint32_t class;
-  grub_uint32_t bar1;
-  grub_uint32_t bar2;
-  int rega;
-  int regb;
-  int i;
-  static int controller = 0;
-  int cs5536 = 0;
-  int nports = 2;
-
-  /* Read class.  */
-  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
-  class = grub_pci_read (addr);
-
-  /* AMD CS5536 Southbridge.  */
-  if (pciid == 0x208f1022)
-    {
-      cs5536 = 1;
-      nports = 1;
-    }
-
-  /* Check if this class ID matches that of a PCI IDE Controller.  */
-  if (!cs5536 && (class >> 16 != 0x0101))
-    return 0;
-
-  for (i = 0; i < nports; i++)
-    {
-      /* Set to 0 when the channel operated in compatibility mode.  */
-      int compat;
-
-      /* We don't support non-compatibility mode for CS5536.  */
-      if (cs5536)
-	compat = 0;
-      else
-	compat = (class >> (8 + 2 * i)) & 1;
-
-      rega = 0;
-      regb = 0;
-
-      /* If the channel is in compatibility mode, just assign the
-	 default registers.  */
-      if (compat == 0 && !compat_use[i])
-	{
-	  rega = grub_ata_ioaddress[i];
-	  regb = grub_ata_ioaddress2[i];
-	  compat_use[i] = 1;
-	}
-      else if (compat)
-	{
-	  /* Read the BARs, which either contain a mmapped IO address
-	     or the IO port address.  */
-	  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESSES
-					+ sizeof (grub_uint64_t) * i);
-	  bar1 = grub_pci_read (addr);
-	  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESSES
-					+ sizeof (grub_uint64_t) * i
-					+ sizeof (grub_uint32_t));
-	  bar2 = grub_pci_read (addr);
-
-	  /* Check if the BARs describe an IO region.  */
-	  if ((bar1 & 1) && (bar2 & 1))
-	    {
-	      rega = bar1 & ~3;
-	      regb = bar2 & ~3;
-	    }
-	}
-
-      grub_dprintf ("ata",
-		    "PCI dev (%d,%d,%d) compat=%d rega=0x%x regb=0x%x\n",
-		    grub_pci_get_bus (dev), grub_pci_get_device (dev),
-		    grub_pci_get_function (dev), compat, rega, regb);
-
-      if (rega && regb)
-	{
-	  grub_errno = GRUB_ERR_NONE;
-	  grub_ata_device_initialize (controller * 2 + i, 0, rega, regb);
-
-	  /* Most errors raised by grub_ata_device_initialize() are harmless.
-	     They just indicate this particular drive is not responding, most
-	     likely because it doesn't exist.  We might want to ignore specific
-	     error types here, instead of printing them.  */
-	  if (grub_errno)
-	    {
-	      grub_print_error ();
-	      grub_errno = GRUB_ERR_NONE;
-	    }
-
-	  grub_ata_device_initialize (controller * 2 + i, 1, rega, regb);
-
-	  /* Likewise.  */
-	  if (grub_errno)
-	    {
-	      grub_print_error ();
-	      grub_errno = GRUB_ERR_NONE;
-	    }
-	}
-    }
-
-  controller++;
-
-  return 0;
-}
-
-static grub_err_t
-grub_ata_initialize (void)
-{
-  grub_pci_iterate (grub_ata_pciinit);
-  return 0;
-}
-
-static void
-grub_ata_setlba (struct grub_ata_device *dev, grub_disk_addr_t sector,
-		 grub_size_t size)
-{
-  grub_ata_regset (dev, GRUB_ATA_REG_SECTORS, size);
-  grub_ata_regset (dev, GRUB_ATA_REG_LBALOW, sector & 0xFF);
-  grub_ata_regset (dev, GRUB_ATA_REG_LBAMID, (sector >> 8) & 0xFF);
-  grub_ata_regset (dev, GRUB_ATA_REG_LBAHIGH, (sector >> 16) & 0xFF);
-}
-
-static grub_err_t
-grub_ata_setaddress (struct grub_ata_device *dev,
-		     grub_ata_addressing_t addressing,
-		     grub_disk_addr_t sector,
-		     grub_size_t size)
-{
-  switch (addressing)
-    {
-    case GRUB_ATA_CHS:
-      {
-	unsigned int cylinder;
-	unsigned int head;
-	unsigned int sect;
-
-	/* Calculate the sector, cylinder and head to use.  */
-	sect = ((grub_uint32_t) sector % dev->sectors_per_track) + 1;
-	cylinder = (((grub_uint32_t) sector / dev->sectors_per_track)
-		    / dev->heads);
-	head = ((grub_uint32_t) sector / dev->sectors_per_track) % dev->heads;
-
-	if (sect > dev->sectors_per_track
-	    || cylinder > dev->cylinders
-	    || head > dev->heads)
-	  return grub_error (GRUB_ERR_OUT_OF_RANGE,
-			     "sector %d cannot be addressed "
-			     "using CHS addressing", sector);
-
-	grub_ata_regset (dev, GRUB_ATA_REG_DISK, (dev->device << 4) | head);
-	if (grub_ata_check_ready (dev))
-	  return grub_errno;
-
-	grub_ata_regset (dev, GRUB_ATA_REG_SECTNUM, sect);
-	grub_ata_regset (dev, GRUB_ATA_REG_CYLLSB, cylinder & 0xFF);
-	grub_ata_regset (dev, GRUB_ATA_REG_CYLMSB, cylinder >> 8);
-
-	break;
-      }
-
-    case GRUB_ATA_LBA:
-      if (size == 256)
-	size = 0;
-      grub_ata_regset (dev, GRUB_ATA_REG_DISK,
-		       0xE0 | (dev->device << 4) | ((sector >> 24) & 0x0F));
-      if (grub_ata_check_ready (dev))
-	return grub_errno;
-
-      grub_ata_setlba (dev, sector, size);
-      break;
-
-    case GRUB_ATA_LBA48:
-      if (size == 65536)
-	size = 0;
-
-      grub_ata_regset (dev, GRUB_ATA_REG_DISK, 0xE0 | (dev->device << 4));
-      if (grub_ata_check_ready (dev))
-	return grub_errno;
-
-      /* Set "Previous".  */
-      grub_ata_setlba (dev, sector >> 24, size >> 8);
-      /* Set "Current".  */
-      grub_ata_setlba (dev, sector, size);
-
-      break;
-    }
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_ata_readwrite (grub_disk_t disk, grub_disk_addr_t sector,
-		    grub_size_t size, char *buf, int rw)
-{
-  struct grub_ata_device *dev = (struct grub_ata_device *) disk->data;
-
-  grub_dprintf("ata", "grub_ata_readwrite (size=%llu, rw=%d)\n", (unsigned long long) size, rw);
-
-  grub_ata_addressing_t addressing = dev->addr;
-  grub_size_t batch;
-  int cmd, cmd_write;
-
-  if (addressing == GRUB_ATA_LBA48 && ((sector + size) >> 28) != 0)
-    {
-      batch = 65536;
-      cmd = GRUB_ATA_CMD_READ_SECTORS_EXT;
-      cmd_write = GRUB_ATA_CMD_WRITE_SECTORS_EXT;
-    }
-  else
-    {
-      if (addressing == GRUB_ATA_LBA48)
-	addressing = GRUB_ATA_LBA;
-      batch = 256;
-      cmd = GRUB_ATA_CMD_READ_SECTORS;
-      cmd_write = GRUB_ATA_CMD_WRITE_SECTORS;
-    }
-
-  grub_size_t nsectors = 0;
-  while (nsectors < size)
-    {
-      if (size - nsectors < batch)
-	batch = size - nsectors;
-
-      grub_dprintf("ata", "rw=%d, sector=%llu, batch=%llu\n", rw, (unsigned long long) sector, (unsigned long long) batch);
-
-      /* Send read/write command.  */
-      if (grub_ata_setaddress (dev, addressing, sector, batch))
-	return grub_errno;
-
-      grub_ata_regset (dev, GRUB_ATA_REG_CMD, (! rw ? cmd : cmd_write));
-
-      unsigned sect;
-      for (sect = 0; sect < batch; sect++)
-	{
-	  /* Wait for !BSY, DRQ.  */
-	  if (grub_ata_wait_drq (dev, rw, GRUB_ATA_TOUT_DATA))
-	    return grub_errno;
-
-	  /* Transfer data.  */
-	  if (! rw)
-	    grub_ata_pio_read (dev, buf, GRUB_DISK_SECTOR_SIZE);
-	  else
-	    grub_ata_pio_write (dev, buf, GRUB_DISK_SECTOR_SIZE);
-
-	  buf += GRUB_DISK_SECTOR_SIZE;
-	}
-
-      if (rw)
-        {
-	  /* Check for write error.  */
-	  if (grub_ata_wait_not_busy (dev, GRUB_ATA_TOUT_DATA))
-	    return grub_errno;
-
-	  if (grub_ata_regget (dev, GRUB_ATA_REG_STATUS)
-	      & (GRUB_ATA_STATUS_DRQ | GRUB_ATA_STATUS_ERR))
-	    return grub_error (GRUB_ERR_WRITE_ERROR, "ATA write error");
-	}
-
-      sector += batch;
-      nsectors += batch;
-    }
-
-  return GRUB_ERR_NONE;
-}
-
-
-
-static int
-grub_ata_iterate (int (*hook) (const char *name))
-{
-  struct grub_ata_device *dev;
-
-  for (dev = grub_ata_devices; dev; dev = dev->next)
-    {
-      char devname[10];
-
-      if (dev->atapi)
-	continue;
-
-      grub_snprintf (devname, sizeof (devname), 
-		     "ata%d", dev->port * 2 + dev->device);
-
-      if (hook (devname))
-	return 1;
-    }
-
-  return 0;
-}
-
-static grub_err_t
-grub_ata_open (const char *name, grub_disk_t disk)
-{
-  struct grub_ata_device *dev;
-
-  for (dev = grub_ata_devices; dev; dev = dev->next)
-    {
-      char devname[10];
-      grub_snprintf (devname, sizeof (devname),
-		     "ata%d", dev->port * 2 + dev->device);
-      if (grub_strcmp (name, devname) == 0)
-	break;
-    }
-
-  if (! dev)
-    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
-
-  if (dev->atapi)
-    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not an ATA harddisk");
-
-  disk->total_sectors = dev->size;
-
-  disk->id = (unsigned long) dev;
-
-  disk->has_partitions = 1;
-  disk->data = dev;
-
-  return 0;
-}
-
-static void
-grub_ata_close (grub_disk_t disk __attribute__((unused)))
-{
-
-}
-
-static grub_err_t
-grub_ata_read (grub_disk_t disk, grub_disk_addr_t sector,
-	       grub_size_t size, char *buf)
-{
-  return grub_ata_readwrite (disk, sector, size, buf, 0);
-}
-
-static grub_err_t
-grub_ata_write (grub_disk_t disk,
-		grub_disk_addr_t sector,
-		grub_size_t size,
-		const char *buf)
-{
-  return grub_ata_readwrite (disk, sector, size, (char *) buf, 1);
-}
-
-static struct grub_disk_dev grub_atadisk_dev =
-  {
-    .name = "ATA",
-    .id = GRUB_DISK_DEVICE_ATA_ID,
-    .iterate = grub_ata_iterate,
-    .open = grub_ata_open,
-    .close = grub_ata_close,
-    .read = grub_ata_read,
-    .write = grub_ata_write,
-    .next = 0
-  };
-
-
-
-/* ATAPI code.  */
-
-static int
-grub_atapi_iterate (int (*hook) (const char *name, int luns))
-{
-  struct grub_ata_device *dev;
-
-  for (dev = grub_ata_devices; dev; dev = dev->next)
-    {
-      char devname[10];
-      grub_snprintf (devname, sizeof (devname),
-		     "ata%d", dev->port * 2 + dev->device);
-
-      if (! dev->atapi)
-	continue;
-
-      if (hook (devname, 1))
-	return 1;
-    }
-
-  return 0;
-
-}
-
-static grub_err_t
-grub_atapi_read (struct grub_scsi *scsi,
-		 grub_size_t cmdsize __attribute__((unused)),
-		 char *cmd, grub_size_t size, char *buf)
-{
-  struct grub_ata_device *dev = (struct grub_ata_device *) scsi->data;
-
-  grub_dprintf("ata", "grub_atapi_read (size=%llu)\n", (unsigned long long) size);
-
-  if (grub_atapi_packet (dev, cmd, size))
-    return grub_errno;
-
-  grub_size_t nread = 0;
-  while (nread < size)
-    {
-      /* Wait for !BSY, DRQ, I/O, !C/D.  */
-      if (grub_atapi_wait_drq (dev, GRUB_ATAPI_IREASON_DATA_IN, GRUB_ATA_TOUT_DATA))
-	return grub_errno;
-
-      /* Get byte count for this DRQ assertion.  */
-      unsigned cnt = grub_ata_regget (dev, GRUB_ATAPI_REG_CNTHIGH) << 8
-		   | grub_ata_regget (dev, GRUB_ATAPI_REG_CNTLOW);
-      grub_dprintf("ata", "DRQ count=%u\n", cnt);
-
-      /* Count of last transfer may be uneven.  */
-      if (! (0 < cnt && cnt <= size - nread && (! (cnt & 1) || cnt == size - nread)))
-	return grub_error (GRUB_ERR_READ_ERROR, "invalid ATAPI transfer count");
-
-      /* Read the data.  */
-      grub_ata_pio_read (dev, buf + nread, cnt);
-
-      if (cnt & 1)
-	buf[nread + cnt - 1] = (char) grub_le_to_cpu16 (grub_inw (dev->ioaddress + GRUB_ATA_REG_DATA));
-
-      nread += cnt;
-    }
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_atapi_write (struct grub_scsi *scsi __attribute__((unused)),
-		  grub_size_t cmdsize __attribute__((unused)),
-		  char *cmd __attribute__((unused)),
-		  grub_size_t size __attribute__((unused)),
-		  char *buf __attribute__((unused)))
-{
-  // XXX: scsi.mod does not use write yet.
-  return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "ATAPI write not implemented");
-}
-
-static grub_err_t
-grub_atapi_open (const char *name, struct grub_scsi *scsi)
-{
-  struct grub_ata_device *dev;
-  struct grub_ata_device *devfnd = 0;
-
-  for (dev = grub_ata_devices; dev; dev = dev->next)
-    {
-      char devname[10];
-      grub_snprintf (devname, sizeof (devname),
-		     "ata%d", dev->port * 2 + dev->device);
-
-      if (!grub_strcmp (devname, name))
-	{
-	  devfnd = dev;
-	  break;
-	}
-    }
-
-  grub_dprintf ("ata", "opening ATAPI dev `%s'\n", name);
-
-  if (! devfnd)
-    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no such ATAPI device");
-
-  scsi->data = devfnd;
-
-  return GRUB_ERR_NONE;
-}
-
-static void
-grub_atapi_close (struct grub_scsi *scsi)
-{
-  grub_free (scsi->name);
-}
-
-static struct grub_scsi_dev grub_atapi_dev =
-  {
-    .name = "ATAPI",
-    .iterate = grub_atapi_iterate,
-    .open = grub_atapi_open,
-    .close = grub_atapi_close,
-    .read = grub_atapi_read,
-    .write = grub_atapi_write
-  };
-
-
-
-GRUB_MOD_INIT(ata)
-{
-  /* To prevent two drivers operating on the same disks.  */
-  grub_disk_firmware_is_tainted = 1;
-  if (grub_disk_firmware_fini)
-    {
-      grub_disk_firmware_fini ();
-      grub_disk_firmware_fini = NULL;
-    }
-
-  /* ATA initialization.  */
-  grub_ata_initialize ();
-
-  grub_disk_dev_register (&grub_atadisk_dev);
-
-  /* ATAPI devices are handled by scsi.mod.  */
-  grub_scsi_dev_register (&grub_atapi_dev);
-}
-
-GRUB_MOD_FINI(ata)
-{
-  grub_scsi_dev_unregister (&grub_atapi_dev);
-  grub_disk_dev_unregister (&grub_atadisk_dev);
-}

disk/ata_pthru.c

@@ -1,107 +0,0 @@
-/* ata_pthru.c - ATA pass through for ata.mod.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/ata.h>
-#include <grub/disk.h>
-#include <grub/dl.h>
-#include <grub/mm.h>
-
-
-/* ATA pass through support, used by hdparm.mod.  */
-static grub_err_t
-grub_ata_pass_through (grub_disk_t disk,
-		       struct grub_disk_ata_pass_through_parms *parms)
-{
-  if (disk->dev->id != GRUB_DISK_DEVICE_ATA_ID)
-    return grub_error (GRUB_ERR_BAD_DEVICE,
-		       "device not accessed via ata.mod");
-
-  struct grub_ata_device *dev = (struct grub_ata_device *) disk->data;
-
-  if (! (parms->size == 0 || parms->size == GRUB_DISK_SECTOR_SIZE))
-    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-		       "ATA multi-sector read and DATA OUT not implemented");
-
-  grub_dprintf ("ata", "ata_pass_through: cmd=0x%x, features=0x%x, sectors=0x%x\n",
-		parms->taskfile[GRUB_ATA_REG_CMD],
-		parms->taskfile[GRUB_ATA_REG_FEATURES],
-		parms->taskfile[GRUB_ATA_REG_SECTORS]);
-  grub_dprintf ("ata", "lba_high=0x%x, lba_mid=0x%x, lba_low=0x%x, size=%d\n",
-	        parms->taskfile[GRUB_ATA_REG_LBAHIGH],
-	        parms->taskfile[GRUB_ATA_REG_LBAMID],
-	        parms->taskfile[GRUB_ATA_REG_LBALOW], parms->size);
-
-  /* Set registers.  */
-  grub_ata_regset (dev, GRUB_ATA_REG_DISK, 0xE0 | dev->device << 4
-		   | (parms->taskfile[GRUB_ATA_REG_DISK] & 0xf));
-  if (grub_ata_check_ready (dev))
-    return grub_errno;
-
-  int i;
-  for (i = GRUB_ATA_REG_FEATURES; i <= GRUB_ATA_REG_LBAHIGH; i++)
-    grub_ata_regset (dev, i, parms->taskfile[i]);
-
-  /* Start command. */
-  grub_ata_regset (dev, GRUB_ATA_REG_CMD, parms->taskfile[GRUB_ATA_REG_CMD]);
-
-  /* Wait for !BSY.  */
-  if (grub_ata_wait_not_busy (dev, GRUB_ATA_TOUT_DATA))
-    return grub_errno;
-
-  /* Check status.  */
-  grub_int8_t sts = grub_ata_regget (dev, GRUB_ATA_REG_STATUS);
-  grub_dprintf ("ata", "status=0x%x\n", sts);
-
-  /* Transfer data.  */
-  if ((sts & (GRUB_ATA_STATUS_DRQ | GRUB_ATA_STATUS_ERR)) == GRUB_ATA_STATUS_DRQ)
-    {
-      if (parms->size != GRUB_DISK_SECTOR_SIZE)
-        return grub_error (GRUB_ERR_READ_ERROR, "DRQ unexpected");
-      grub_ata_pio_read (dev, parms->buffer, GRUB_DISK_SECTOR_SIZE);
-    }
-
-  /* Return registers.  */
-  for (i = GRUB_ATA_REG_ERROR; i <= GRUB_ATA_REG_STATUS; i++)
-    parms->taskfile[i] = grub_ata_regget (dev, i);
-
-  grub_dprintf ("ata", "status=0x%x, error=0x%x, sectors=0x%x\n",
-	        parms->taskfile[GRUB_ATA_REG_STATUS],
-	        parms->taskfile[GRUB_ATA_REG_ERROR],
-		parms->taskfile[GRUB_ATA_REG_SECTORS]);
-
-  if (parms->taskfile[GRUB_ATA_REG_STATUS]
-      & (GRUB_ATA_STATUS_DRQ | GRUB_ATA_STATUS_ERR))
-    return grub_error (GRUB_ERR_READ_ERROR, "ATA passthrough failed");
-
-  return GRUB_ERR_NONE;
-}
-
-
-
-GRUB_MOD_INIT(ata_pthru)
-{
-  /* Register ATA pass through function.  */
-  grub_disk_ata_pass_through = grub_ata_pass_through;
-}
-
-GRUB_MOD_FINI(ata_pthru)
-{
-  if (grub_disk_ata_pass_through == grub_ata_pass_through)
-    grub_disk_ata_pass_through = NULL;
-}

disk/i386/pc/biosdisk.c

@@ -1,414 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/machine/biosdisk.h>
-#include <grub/machine/memory.h>
-#include <grub/machine/kernel.h>
-#include <grub/disk.h>
-#include <grub/dl.h>
-#include <grub/mm.h>
-#include <grub/types.h>
-#include <grub/misc.h>
-#include <grub/err.h>
-#include <grub/term.h>
-
-static int cd_drive = 0;
-
-static int
-grub_biosdisk_get_drive (const char *name)
-{
-  unsigned long drive;
-
-  if ((name[0] != 'f' && name[0] != 'h') || name[1] != 'd')
-    goto fail;
-
-  drive = grub_strtoul (name + 2, 0, 10);
-  if (grub_errno != GRUB_ERR_NONE)
-    goto fail;
-
-  if (name[0] == 'h')
-    drive += 0x80;
-
-  return (int) drive ;
-
- fail:
-  grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a biosdisk");
-  return -1;
-}
-
-static int
-grub_biosdisk_call_hook (int (*hook) (const char *name), int drive)
-{
-  char name[10];
-
-  grub_snprintf (name, sizeof (name),
-		 (drive & 0x80) ? "hd%d" : "fd%d", drive & (~0x80));
-  return hook (name);
-}
-
-static int
-grub_biosdisk_iterate (int (*hook) (const char *name))
-{
-  int drive;
-  int num_floppies;
-
-  /* For hard disks, attempt to read the MBR.  */
-  for (drive = 0x80; drive < 0x90; drive++)
-    {
-      if (grub_biosdisk_rw_standard (0x02, drive, 0, 0, 1, 1,
-				     GRUB_MEMORY_MACHINE_SCRATCH_SEG) != 0)
-	{
-	  grub_dprintf ("disk", "Read error when probing drive 0x%2x\n", drive);
-	  break;
-	}
-
-      if (grub_biosdisk_call_hook (hook, drive))
-	return 1;
-    }
-
-  if (cd_drive)
-    {
-      if (grub_biosdisk_call_hook (hook, cd_drive))
-      return 1;
-    }
-
-  /* For floppy disks, we can get the number safely.  */
-  num_floppies = grub_biosdisk_get_num_floppies ();
-  for (drive = 0; drive < num_floppies; drive++)
-    if (grub_biosdisk_call_hook (hook, drive))
-      return 1;
-
-  return 0;
-}
-
-static grub_err_t
-grub_biosdisk_open (const char *name, grub_disk_t disk)
-{
-  grub_uint64_t total_sectors = 0;
-  int drive;
-  struct grub_biosdisk_data *data;
-
-  drive = grub_biosdisk_get_drive (name);
-  if (drive < 0)
-    return grub_errno;
-
-  disk->has_partitions = ((drive & 0x80) && (drive != cd_drive));
-  disk->id = drive;
-
-  data = (struct grub_biosdisk_data *) grub_zalloc (sizeof (*data));
-  if (! data)
-    return grub_errno;
-
-  data->drive = drive;
-
-  if ((cd_drive) && (drive == cd_drive))
-    {
-      data->flags = GRUB_BIOSDISK_FLAG_LBA | GRUB_BIOSDISK_FLAG_CDROM;
-      data->sectors = 32;
-      total_sectors = GRUB_ULONG_MAX;  /* TODO: get the correct size.  */
-    }
-  else if (drive & 0x80)
-    {
-      /* HDD */
-      int version;
-
-      version = grub_biosdisk_check_int13_extensions (drive);
-      if (version)
-	{
-	  struct grub_biosdisk_drp *drp
-	    = (struct grub_biosdisk_drp *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
-
-	  /* Clear out the DRP.  */
-	  grub_memset (drp, 0, sizeof (*drp));
-	  drp->size = sizeof (*drp);
-	  if (! grub_biosdisk_get_diskinfo_int13_extensions (drive, drp))
-	    {
-	      data->flags = GRUB_BIOSDISK_FLAG_LBA;
-
-	      if (drp->total_sectors)
-		total_sectors = drp->total_sectors;
-	      else
-                /* Some buggy BIOSes doesn't return the total sectors
-                   correctly but returns zero. So if it is zero, compute
-                   it by C/H/S returned by the LBA BIOS call.  */
-                total_sectors = drp->cylinders * drp->heads * drp->sectors;
-	    }
-	}
-    }
-
-  if (! (data->flags & GRUB_BIOSDISK_FLAG_CDROM))
-    {
-      if (grub_biosdisk_get_diskinfo_standard (drive,
-					       &data->cylinders,
-					       &data->heads,
-					       &data->sectors) != 0)
-        {
-	  if (total_sectors && (data->flags & GRUB_BIOSDISK_FLAG_LBA))
-	    {
-	      data->sectors = 63;
-	      data->heads = 255;
-	      data->cylinders
-		= grub_divmod64 (total_sectors
-				 + data->heads * data->sectors - 1,
-				 data->heads * data->sectors, 0);
-	    }
-	  else
-	    {
-	      grub_free (data);
-	      return grub_error (GRUB_ERR_BAD_DEVICE, "%s cannot get C/H/S values", disk->name);
-	    }
-        }
-
-      if (! total_sectors)
-        total_sectors = data->cylinders * data->heads * data->sectors;
-    }
-
-  disk->total_sectors = total_sectors;
-  disk->data = data;
-
-  return GRUB_ERR_NONE;
-}
-
-static void
-grub_biosdisk_close (grub_disk_t disk)
-{
-  grub_free (disk->data);
-}
-
-/* For readability.  */
-#define GRUB_BIOSDISK_READ	0
-#define GRUB_BIOSDISK_WRITE	1
-
-#define GRUB_BIOSDISK_CDROM_RETRY_COUNT 3
-
-static grub_err_t
-grub_biosdisk_rw (int cmd, grub_disk_t disk,
-		  grub_disk_addr_t sector, grub_size_t size,
-		  unsigned segment)
-{
-  struct grub_biosdisk_data *data = disk->data;
-
-  if (data->flags & GRUB_BIOSDISK_FLAG_LBA)
-    {
-      struct grub_biosdisk_dap *dap;
-
-      dap = (struct grub_biosdisk_dap *) (GRUB_MEMORY_MACHINE_SCRATCH_ADDR
-					  + (data->sectors
-					     << GRUB_DISK_SECTOR_BITS));
-      dap->length = sizeof (*dap);
-      dap->reserved = 0;
-      dap->blocks = size;
-      dap->buffer = segment << 16;	/* The format SEGMENT:ADDRESS.  */
-      dap->block = sector;
-
-      if (data->flags & GRUB_BIOSDISK_FLAG_CDROM)
-        {
-	  int i;
-
-	  if (cmd)
-	    return grub_error (GRUB_ERR_WRITE_ERROR, "can\'t write to cdrom");
-
-	  dap->blocks = ALIGN_UP (dap->blocks, 4) >> 2;
-	  dap->block >>= 2;
-
-	  for (i = 0; i < GRUB_BIOSDISK_CDROM_RETRY_COUNT; i++)
-            if (! grub_biosdisk_rw_int13_extensions (0x42, data->drive, dap))
-	      break;
-
-	  if (i == GRUB_BIOSDISK_CDROM_RETRY_COUNT)
-	    return grub_error (GRUB_ERR_READ_ERROR, "cdrom read error");
-	}
-      else
-        if (grub_biosdisk_rw_int13_extensions (cmd + 0x42, data->drive, dap))
-	  {
-	    /* Fall back to the CHS mode.  */
-	    data->flags &= ~GRUB_BIOSDISK_FLAG_LBA;
-	    disk->total_sectors = data->cylinders * data->heads * data->sectors;
-	    return grub_biosdisk_rw (cmd, disk, sector, size, segment);
-	  }
-    }
-  else
-    {
-      unsigned coff, hoff, soff;
-      unsigned head;
-
-      /* It is impossible to reach over 8064 MiB (a bit less than LBA24) with
-	 the traditional CHS access.  */
-      if (sector >
-	  1024 /* cylinders */ *
-	  256 /* heads */ *
-	  63 /* spt */)
-	return grub_error (GRUB_ERR_OUT_OF_RANGE, "%s out of disk", disk->name);
-
-      soff = ((grub_uint32_t) sector) % data->sectors + 1;
-      head = ((grub_uint32_t) sector) / data->sectors;
-      hoff = head % data->heads;
-      coff = head / data->heads;
-
-      if (coff >= data->cylinders)
-	return grub_error (GRUB_ERR_OUT_OF_RANGE, "%s out of disk", disk->name);
-
-      if (grub_biosdisk_rw_standard (cmd + 0x02, data->drive,
-				     coff, hoff, soff, size, segment))
-	{
-	  switch (cmd)
-	    {
-	    case GRUB_BIOSDISK_READ:
-	      return grub_error (GRUB_ERR_READ_ERROR, "%s read error", disk->name);
-	    case GRUB_BIOSDISK_WRITE:
-	      return grub_error (GRUB_ERR_WRITE_ERROR, "%s write error", disk->name);
-	    }
-	}
-    }
-
-  return GRUB_ERR_NONE;
-}
-
-/* Return the number of sectors which can be read safely at a time.  */
-static grub_size_t
-get_safe_sectors (grub_disk_addr_t sector, grub_uint32_t sectors)
-{
-  grub_size_t size;
-  grub_uint32_t offset;
-
-  /* OFFSET = SECTOR % SECTORS */
-  grub_divmod64 (sector, sectors, &offset);
-
-  size = sectors - offset;
-
-  /* Limit the max to 0x7f because of Phoenix EDD.  */
-  if (size > 0x7f)
-    size = 0x7f;
-
-  return size;
-}
-
-static grub_err_t
-grub_biosdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
-		    grub_size_t size, char *buf)
-{
-  struct grub_biosdisk_data *data = disk->data;
-
-  while (size)
-    {
-      grub_size_t len;
-      grub_size_t cdoff = 0;
-
-      len = get_safe_sectors (sector, data->sectors);
-
-      if (data->flags & GRUB_BIOSDISK_FLAG_CDROM)
-	{
-	  cdoff = (sector & 3) << GRUB_DISK_SECTOR_BITS;
-	  len = ALIGN_UP (sector + len, 4) - (sector & ~3);
-	  sector &= ~3;
-	}
-
-      if (len > size)
-	len = size;
-
-      if (grub_biosdisk_rw (GRUB_BIOSDISK_READ, disk, sector, len,
-			    GRUB_MEMORY_MACHINE_SCRATCH_SEG))
-	return grub_errno;
-
-      grub_memcpy (buf, (void *) (GRUB_MEMORY_MACHINE_SCRATCH_ADDR + cdoff),
-		   len << GRUB_DISK_SECTOR_BITS);
-      buf += len << GRUB_DISK_SECTOR_BITS;
-      sector += len;
-      size -= len;
-    }
-
-  return grub_errno;
-}
-
-static grub_err_t
-grub_biosdisk_write (grub_disk_t disk, grub_disk_addr_t sector,
-		     grub_size_t size, const char *buf)
-{
-  struct grub_biosdisk_data *data = disk->data;
-
-  if (data->flags & GRUB_BIOSDISK_FLAG_CDROM)
-    return grub_error (GRUB_ERR_IO, "can't write to CDROM");
-
-  while (size)
-    {
-      grub_size_t len;
-
-      len = get_safe_sectors (sector, data->sectors);
-      if (len > size)
-	len = size;
-
-      grub_memcpy ((void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR, buf,
-		   len << GRUB_DISK_SECTOR_BITS);
-
-      if (grub_biosdisk_rw (GRUB_BIOSDISK_WRITE, disk, sector, len,
-			    GRUB_MEMORY_MACHINE_SCRATCH_SEG))
-	return grub_errno;
-
-      buf += len << GRUB_DISK_SECTOR_BITS;
-      sector += len;
-      size -= len;
-    }
-
-  return grub_errno;
-}
-
-static struct grub_disk_dev grub_biosdisk_dev =
-  {
-    .name = "biosdisk",
-    .id = GRUB_DISK_DEVICE_BIOSDISK_ID,
-    .iterate = grub_biosdisk_iterate,
-    .open = grub_biosdisk_open,
-    .close = grub_biosdisk_close,
-    .read = grub_biosdisk_read,
-    .write = grub_biosdisk_write,
-    .next = 0
-  };
-
-static void
-grub_disk_biosdisk_fini (void)
-{
-  grub_disk_dev_unregister (&grub_biosdisk_dev);
-}
-
-GRUB_MOD_INIT(biosdisk)
-{
-  struct grub_biosdisk_cdrp *cdrp
-        = (struct grub_biosdisk_cdrp *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
-
-  if (grub_disk_firmware_is_tainted)
-    {
-      grub_printf ("Firmware is marked as tainted, refusing to initialize.\n");
-      return;
-    }
-  grub_disk_firmware_fini = grub_disk_biosdisk_fini;
-
-  grub_memset (cdrp, 0, sizeof (*cdrp));
-  cdrp->size = sizeof (*cdrp);
-  cdrp->media_type = 0xFF;
-  if ((! grub_biosdisk_get_cdinfo_int13_extensions (grub_boot_drive, cdrp)) &&
-      ((cdrp->media_type & GRUB_BIOSDISK_CDTYPE_MASK)
-       == GRUB_BIOSDISK_CDTYPE_NO_EMUL))
-    cd_drive = cdrp->drive_no;
-
-  grub_disk_dev_register (&grub_biosdisk_dev);
-}
-
-GRUB_MOD_FINI(biosdisk)
-{
-  grub_disk_biosdisk_fini ();
-}

disk/ieee1275/ofdisk.c

@@ -1,285 +0,0 @@
-/* ofdisk.c - Open Firmware disk access.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2004,2006,2007,2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/misc.h>
-#include <grub/disk.h>
-#include <grub/mm.h>
-#include <grub/ieee1275/ieee1275.h>
-#include <grub/ieee1275/ofdisk.h>
-
-struct ofdisk_hash_ent
-{
-  char *devpath;
-  struct ofdisk_hash_ent *next;
-};
-
-#define OFDISK_HASH_SZ	8
-static struct ofdisk_hash_ent *ofdisk_hash[OFDISK_HASH_SZ];
-
-static int
-ofdisk_hash_fn (const char *devpath)
-{
-  int hash = 0;
-  while (*devpath)
-    hash ^= *devpath++;
-  return (hash & (OFDISK_HASH_SZ - 1));
-}
-
-static struct ofdisk_hash_ent *
-ofdisk_hash_find (const char *devpath)
-{
-  struct ofdisk_hash_ent *p = ofdisk_hash[ofdisk_hash_fn(devpath)];
-
-  while (p)
-    {
-      if (!grub_strcmp (p->devpath, devpath))
-	break;
-      p = p->next;
-    }
-  return p;
-}
-
-static struct ofdisk_hash_ent *
-ofdisk_hash_add (char *devpath)
-{
-  struct ofdisk_hash_ent **head = &ofdisk_hash[ofdisk_hash_fn(devpath)];
-  struct ofdisk_hash_ent *p = grub_malloc(sizeof (*p));
-
-  if (p)
-    {
-      p->devpath = devpath;
-      p->next = *head;
-      *head = p;
-    }
-  return p;
-}
-
-static int
-grub_ofdisk_iterate (int (*hook) (const char *name))
-{
-  auto int dev_iterate (struct grub_ieee1275_devalias *alias);
-
-  int dev_iterate (struct grub_ieee1275_devalias *alias)
-    {
-      int ret = 0;
-
-      grub_dprintf ("disk", "disk name = %s\n", alias->name);
-
-      if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_OFDISK_SDCARD_ONLY))
-	{
-	  grub_ieee1275_phandle_t dev;
-	  char tmp[8];
-
-	  if (grub_ieee1275_finddevice (alias->path, &dev))
-	    {
-	      grub_dprintf ("disk", "finddevice (%s) failed\n", alias->path);
-	      return 0;
-	    }
-
-	  if (grub_ieee1275_get_property (dev, "iconname", tmp,
-					  sizeof tmp, 0))
-	    {
-	      grub_dprintf ("disk", "get iconname failed\n");
-	      return 0;
-	    }
-
-	  if (grub_strcmp (tmp, "sdmmc"))
-	    {
-	      grub_dprintf ("disk", "device is not an SD card\n");
-	      return 0;
-	    }
-	}
-
-      if (! grub_strcmp (alias->type, "block") &&
-	  grub_strncmp (alias->name, "cdrom", 5))
-	ret = hook (alias->name);
-      return ret;
-    }
-
-  return grub_devalias_iterate (dev_iterate);
-}
-
-static char *
-compute_dev_path (const char *name)
-{
-  char *devpath = grub_malloc (grub_strlen (name) + 3);
-  char *p, c;
-
-  if (!devpath)
-    return NULL;
-
-  /* Un-escape commas. */
-  p = devpath;
-  while ((c = *name++) != '\0')
-    {
-      if (c == '\\' && *name == ',')
-	{
-	  *p++ = ',';
-	  name++;
-	}
-      else
-	*p++ = c;
-    }
-
-  if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0))
-    {
-      *p++ = ':';
-      *p++ = '0';
-    }
-  *p++ = '\0';
-
-  return devpath;
-}
-
-static grub_err_t
-grub_ofdisk_open (const char *name, grub_disk_t disk)
-{
-  grub_ieee1275_phandle_t dev;
-  grub_ieee1275_ihandle_t dev_ihandle = 0;
-  struct ofdisk_hash_ent *op;
-  char *devpath;
-  /* XXX: This should be large enough for any possible case.  */
-  char prop[64];
-  grub_ssize_t actual;
-
-  devpath = compute_dev_path (name);
-  if (! devpath)
-    return grub_errno;
-
-  op = ofdisk_hash_find (devpath);
-  if (!op)
-    op = ofdisk_hash_add (devpath);
-
-  grub_free (devpath);
-  if (!op)
-    return grub_errno;
-
-  grub_dprintf ("disk", "Opening `%s'.\n", op->devpath);
-
-  if (grub_ieee1275_finddevice (op->devpath, &dev))
-    {
-      grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't read device properties");
-      goto fail;
-    }
-
-  if (grub_ieee1275_get_property (dev, "device_type", prop, sizeof (prop),
-				  &actual))
-    {
-      grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't read the device type");
-      goto fail;
-    }
-
-  if (grub_strcmp (prop, "block"))
-    {
-      grub_error (GRUB_ERR_BAD_DEVICE, "not a block device");
-      goto fail;
-    }
-
-  grub_ieee1275_open (op->devpath, &dev_ihandle);
-  if (! dev_ihandle)
-    {
-      grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
-      goto fail;
-    }
-
-  grub_dprintf ("disk", "Opened `%s' as handle %p.\n", op->devpath,
-		(void *) (unsigned long) dev_ihandle);
-
-  /* XXX: There is no property to read the number of blocks.  There
-     should be a property `#blocks', but it is not there.  Perhaps it
-     is possible to use seek for this.  */
-  disk->total_sectors = 0xFFFFFFFFUL;
-
-  disk->id = (unsigned long) op;
-
-  /* XXX: Read this, somehow.  */
-  disk->has_partitions = 1;
-  disk->data = (void *) (unsigned long) dev_ihandle;
-  return 0;
-
- fail:
-  if (dev_ihandle)
-    grub_ieee1275_close (dev_ihandle);
-  return grub_errno;
-}
-
-static void
-grub_ofdisk_close (grub_disk_t disk)
-{
-  grub_dprintf ("disk", "Closing handle %p.\n",
-		(void *) disk->data);
-  grub_ieee1275_close ((grub_ieee1275_ihandle_t) (unsigned long) disk->data);
-}
-
-static grub_err_t
-grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
-		  grub_size_t size, char *buf)
-{
-  grub_ssize_t status, actual;
-  unsigned long long pos;
-
-  pos = sector * 512UL;
-
-  grub_ieee1275_seek ((grub_ieee1275_ihandle_t) (unsigned long) disk->data,
-		      pos, &status);
-  if (status < 0)
-    return grub_error (GRUB_ERR_READ_ERROR,
-		       "seek error, can't seek block %llu",
-		       (long long) sector);
-  grub_ieee1275_read ((grub_ieee1275_ihandle_t) (unsigned long) disk->data,
-		      buf, size * 512UL, &actual);
-  if (actual != (grub_ssize_t) (size * 512UL))
-    return grub_error (GRUB_ERR_READ_ERROR, "read error on block: %llu",
-		       (long long) sector);
-
-  return 0;
-}
-
-static grub_err_t
-grub_ofdisk_write (grub_disk_t disk __attribute ((unused)),
-		   grub_disk_addr_t sector __attribute ((unused)),
-		   grub_size_t size __attribute ((unused)),
-		   const char *buf __attribute ((unused)))
-{
-  return GRUB_ERR_NOT_IMPLEMENTED_YET;
-}
-
-static struct grub_disk_dev grub_ofdisk_dev =
-  {
-    .name = "ofdisk",
-    .id = GRUB_DISK_DEVICE_OFDISK_ID,
-    .iterate = grub_ofdisk_iterate,
-    .open = grub_ofdisk_open,
-    .close = grub_ofdisk_close,
-    .read = grub_ofdisk_read,
-    .write = grub_ofdisk_write,
-    .next = 0
-  };
-
-void
-grub_ofdisk_init (void)
-{
-  grub_disk_dev_register (&grub_ofdisk_dev);
-}
-
-void
-grub_ofdisk_fini (void)
-{
-  grub_disk_dev_unregister (&grub_ofdisk_dev);
-}

disk/lvm.c

@@ -1,617 +0,0 @@
-/* lvm.c - module to read Logical Volumes.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/disk.h>
-#include <grub/mm.h>
-#include <grub/err.h>
-#include <grub/misc.h>
-#include <grub/lvm.h>
-
-static struct grub_lvm_vg *vg_list;
-static int lv_count;
-
-
-/* Go the string STR and return the number after STR.  *P will point
-   at the number.  In case STR is not found, *P will be NULL and the
-   return value will be 0.  */
-static int
-grub_lvm_getvalue (char **p, char *str)
-{
-  *p = grub_strstr (*p, str);
-  if (! *p)
-    return 0;
-  *p += grub_strlen (str);
-  return grub_strtoul (*p, NULL, 10);
-}
-
-static int
-grub_lvm_iterate (int (*hook) (const char *name))
-{
-  struct grub_lvm_vg *vg;
-  for (vg = vg_list; vg; vg = vg->next)
-    {
-      struct grub_lvm_lv *lv;
-      if (vg->lvs)
-	for (lv = vg->lvs; lv; lv = lv->next)
-	  if (hook (lv->name))
-	    return 1;
-    }
-
-  return 0;
-}
-
-#ifdef GRUB_UTIL
-static grub_disk_memberlist_t
-grub_lvm_memberlist (grub_disk_t disk)
-{
-  struct grub_lvm_lv *lv = disk->data;
-  grub_disk_memberlist_t list = NULL, tmp;
-  struct grub_lvm_pv *pv;
-
-  if (lv->vg->pvs)
-    for (pv = lv->vg->pvs; pv; pv = pv->next)
-      {
-	tmp = grub_malloc (sizeof (*tmp));
-	tmp->disk = pv->disk;
-	tmp->next = list;
-	list = tmp;
-      }
-
-  return list;
-}
-#endif
-
-static grub_err_t
-grub_lvm_open (const char *name, grub_disk_t disk)
-{
-  struct grub_lvm_vg *vg;
-  struct grub_lvm_lv *lv = NULL;
-  for (vg = vg_list; vg; vg = vg->next)
-    {
-      if (vg->lvs)
-	for (lv = vg->lvs; lv; lv = lv->next)
-	  if (! grub_strcmp (lv->name, name))
-	    break;
-
-      if (lv)
-	break;
-    }
-
-  if (! lv)
-    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "unknown LVM device %s", name);
-
-  disk->has_partitions = 0;
-  disk->id = lv->number;
-  disk->data = lv;
-  disk->total_sectors = lv->size;
-
-  return 0;
-}
-
-static void
-grub_lvm_close (grub_disk_t disk __attribute ((unused)))
-{
-  return;
-}
-
-static grub_err_t
-grub_lvm_read (grub_disk_t disk, grub_disk_addr_t sector,
-		grub_size_t size, char *buf)
-{
-  grub_err_t err = 0;
-  struct grub_lvm_lv *lv = disk->data;
-  struct grub_lvm_vg *vg = lv->vg;
-  struct grub_lvm_segment *seg = lv->segments;
-  struct grub_lvm_pv *pv;
-  grub_uint64_t offset;
-  grub_uint64_t extent;
-  unsigned int i;
-
-  extent = grub_divmod64 (sector, vg->extent_size, NULL);
-
-  /* Find the right segment.  */
-  for (i = 0; i < lv->segment_count; i++)
-    {
-      if ((seg->start_extent <= extent)
-	  && ((seg->start_extent + seg->extent_count) > extent))
-	{
-	  break;
-	}
-
-      seg++;
-    }
-
-  if (seg->stripe_count == 1)
-    {
-      /* This segment is linear, so that's easy.  We just need to find
-	 out the offset in the physical volume and read SIZE bytes
-	 from that.  */
-      struct grub_lvm_stripe *stripe = seg->stripes;
-      grub_uint64_t seg_offset; /* Offset of the segment in PV device.  */
-
-      pv = stripe->pv;
-      seg_offset = ((grub_uint64_t) stripe->start
-		    * (grub_uint64_t) vg->extent_size) + pv->start;
-
-      offset = sector - ((grub_uint64_t) seg->start_extent
-			 * (grub_uint64_t) vg->extent_size) + seg_offset;
-    }
-  else
-    {
-      /* This is a striped segment. We have to find the right PV
-	 similar to RAID0. */
-      struct grub_lvm_stripe *stripe = seg->stripes;
-      grub_uint32_t a, b;
-      grub_uint64_t seg_offset; /* Offset of the segment in PV device.  */
-      unsigned int stripenr;
-
-      offset = sector - ((grub_uint64_t) seg->start_extent
-			 * (grub_uint64_t) vg->extent_size);
-
-      a = grub_divmod64 (offset, seg->stripe_size, NULL);
-      grub_divmod64 (a, seg->stripe_count, &stripenr);
-
-      a = grub_divmod64 (offset, seg->stripe_size * seg->stripe_count, NULL);
-      grub_divmod64 (offset, seg->stripe_size, &b);
-      offset = a * seg->stripe_size + b;
-
-      stripe += stripenr;
-      pv = stripe->pv;
-
-      seg_offset = ((grub_uint64_t) stripe->start
-		    * (grub_uint64_t) vg->extent_size) + pv->start;
-
-      offset += seg_offset;
-    }
-
-  /* Check whether we actually know the physical volume we want to
-     read from.  */
-  if (pv->disk)
-    err = grub_disk_read (pv->disk, offset, 0,
-			  size << GRUB_DISK_SECTOR_BITS, buf);
-  else
-    err = grub_error (GRUB_ERR_UNKNOWN_DEVICE,
-		      "physical volume %s not found", pv->name);
-
-  return err;
-}
-
-static grub_err_t
-grub_lvm_write (grub_disk_t disk __attribute ((unused)),
-		 grub_disk_addr_t sector __attribute ((unused)),
-		 grub_size_t size __attribute ((unused)),
-		 const char *buf __attribute ((unused)))
-{
-  return GRUB_ERR_NOT_IMPLEMENTED_YET;
-}
-
-static int
-grub_lvm_scan_device (const char *name)
-{
-  grub_err_t err;
-  grub_disk_t disk;
-  grub_uint64_t da_offset, da_size, mda_offset, mda_size;
-  char buf[GRUB_LVM_LABEL_SIZE];
-  char vg_id[GRUB_LVM_ID_STRLEN+1];
-  char pv_id[GRUB_LVM_ID_STRLEN+1];
-  char *metadatabuf, *p, *q, *vgname;
-  struct grub_lvm_label_header *lh = (struct grub_lvm_label_header *) buf;
-  struct grub_lvm_pv_header *pvh;
-  struct grub_lvm_disk_locn *dlocn;
-  struct grub_lvm_mda_header *mdah;
-  struct grub_lvm_raw_locn *rlocn;
-  unsigned int i, j, vgname_len;
-  struct grub_lvm_vg *vg;
-  struct grub_lvm_pv *pv;
-
-  disk = grub_disk_open (name);
-  if (!disk)
-    return 0;
-
-  /* Search for label. */
-  for (i = 0; i < GRUB_LVM_LABEL_SCAN_SECTORS; i++)
-    {
-      err = grub_disk_read (disk, i, 0, sizeof(buf), buf);
-      if (err)
-	goto fail;
-
-      if ((! grub_strncmp ((char *)lh->id, GRUB_LVM_LABEL_ID,
-			   sizeof (lh->id)))
-	  && (! grub_strncmp ((char *)lh->type, GRUB_LVM_LVM2_LABEL,
-			      sizeof (lh->type))))
-	break;
-    }
-
-  /* Return if we didn't find a label. */
-  if (i == GRUB_LVM_LABEL_SCAN_SECTORS)
-    goto fail;
-
-  pvh = (struct grub_lvm_pv_header *) (buf + grub_le_to_cpu32(lh->offset_xl));
-
-  for (i = 0, j = 0; i < GRUB_LVM_ID_LEN; i++)
-    {
-      pv_id[j++] = pvh->pv_uuid[i];
-      if ((i != 1) && (i != 29) && (i % 4 == 1))
-	pv_id[j++] = '-';
-    }
-  pv_id[j] = '\0';
-
-  dlocn = pvh->disk_areas_xl;
-  da_offset = grub_le_to_cpu64 (dlocn->offset);
-  da_size = grub_le_to_cpu64 (dlocn->size);
-
-  dlocn++;
-  /* Is it possible to have multiple data/metadata areas? I haven't
-     seen devices that have it. */
-  if (dlocn->offset)
-    {
-      grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-		  "we don't support multiple LVM data areas");
-
-      goto fail;
-    }
-
-  dlocn++;
-  mda_offset = grub_le_to_cpu64 (dlocn->offset);
-  mda_size = grub_le_to_cpu64 (dlocn->size);
-
-  /* It's possible to have multiple copies of metadata areas, we just use the
-     first one.  */
-
-  /* Allocate buffer space for the circular worst-case scenario. */
-  metadatabuf = grub_malloc (2 * mda_size);
-  if (! metadatabuf)
-    goto fail;
-
-  err = grub_disk_read (disk, 0, mda_offset, mda_size, metadatabuf);
-  if (err)
-    goto fail2;
-
-  mdah = (struct grub_lvm_mda_header *) metadatabuf;
-  if ((grub_strncmp ((char *)mdah->magic, GRUB_LVM_FMTT_MAGIC,
-		     sizeof (mdah->magic)))
-      || (grub_le_to_cpu32 (mdah->version) != GRUB_LVM_FMTT_VERSION))
-    {
-      grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-		  "unknown LVM metadata header");
-      goto fail2;
-    }
-
-  rlocn = mdah->raw_locns;
-  if (grub_le_to_cpu64 (rlocn->offset) + grub_le_to_cpu64 (rlocn->size) >
-      grub_le_to_cpu64 (mdah->size))
-    {
-      /* Metadata is circular. Copy the wrap in place. */
-      grub_memcpy (metadatabuf + mda_size,
-                   metadatabuf + GRUB_LVM_MDA_HEADER_SIZE,
-                   grub_le_to_cpu64 (rlocn->offset) +
-                   grub_le_to_cpu64 (rlocn->size) -
-                   grub_le_to_cpu64 (mdah->size));
-    }
-  p = q = metadatabuf + grub_le_to_cpu64 (rlocn->offset);
-
-  while (*q != ' ' && q < metadatabuf + mda_size)
-    q++;
-
-  if (q == metadatabuf + mda_size)
-    goto fail2;
-
-  vgname_len = q - p;
-  vgname = grub_malloc (vgname_len + 1);
-  if (!vgname)
-    goto fail2;
-
-  grub_memcpy (vgname, p, vgname_len);
-  vgname[vgname_len] = '\0';
-
-  p = grub_strstr (q, "id = \"");
-  if (p == NULL)
-    goto fail3;
-  p += sizeof ("id = \"") - 1;
-  grub_memcpy (vg_id, p, GRUB_LVM_ID_STRLEN);
-  vg_id[GRUB_LVM_ID_STRLEN] = '\0';
-
-  for (vg = vg_list; vg; vg = vg->next)
-    {
-      if (! grub_memcmp(vg_id, vg->id, GRUB_LVM_ID_STRLEN))
-	break;
-    }
-
-  if (! vg)
-    {
-      /* First time we see this volume group. We've to create the
-	 whole volume group structure. */
-      vg = grub_malloc (sizeof (*vg));
-      if (! vg)
-	goto fail3;
-      vg->name = vgname;
-      grub_memcpy (vg->id, vg_id, GRUB_LVM_ID_STRLEN+1);
-
-      vg->extent_size = grub_lvm_getvalue (&p, "extent_size = ");
-      if (p == NULL)
-	goto fail4;
-
-      vg->lvs = NULL;
-      vg->pvs = NULL;
-
-      p = grub_strstr (p, "physical_volumes {");
-      if (p)
-	{
-	  p += sizeof ("physical_volumes {") - 1;
-
-	  /* Add all the pvs to the volume group. */
-	  while (1)
-	    {
-	      int s;
-	      while (grub_isspace (*p))
-		p++;
-
-	      if (*p == '}')
-		break;
-
-	      pv = grub_malloc (sizeof (*pv));
-	      q = p;
-	      while (*q != ' ')
-		q++;
-
-	      s = q - p;
-	      pv->name = grub_malloc (s + 1);
-	      grub_memcpy (pv->name, p, s);
-	      pv->name[s] = '\0';
-
-	      p = grub_strstr (p, "id = \"");
-	      if (p == NULL)
-		goto pvs_fail;
-	      p += sizeof("id = \"") - 1;
-
-	      grub_memcpy (pv->id, p, GRUB_LVM_ID_STRLEN);
-	      pv->id[GRUB_LVM_ID_STRLEN] = '\0';
-
-	      pv->start = grub_lvm_getvalue (&p, "pe_start = ");
-	      if (p == NULL)
-		goto pvs_fail;
-
-	      p = grub_strchr (p, '}');
-	      if (p == NULL)
-		goto pvs_fail;
-	      p++;
-
-	      pv->disk = NULL;
-	      pv->next = vg->pvs;
-	      vg->pvs = pv;
-
-	      continue;
-	    pvs_fail:
-	      grub_free (pv->name);
-	      grub_free (pv);
-	      goto fail4;
-	    }
-	}
-
-      p = grub_strstr (p, "logical_volumes");
-      if (p)
-	{
-	  p += 18;
-
-	  /* And add all the lvs to the volume group. */
-	  while (1)
-	    {
-	      int s;
-	      struct grub_lvm_lv *lv;
-	      struct grub_lvm_segment *seg;
-
-	      while (grub_isspace (*p))
-		p++;
-
-	      if (*p == '}')
-		break;
-
-	      lv = grub_malloc (sizeof (*lv));
-
-	      q = p;
-	      while (*q != ' ')
-		q++;
-
-	      s = q - p;
-	      lv->name = grub_malloc (vgname_len + 1 + s + 1);
-	      grub_memcpy (lv->name, vgname, vgname_len);
-	      lv->name[vgname_len] = '-';
-	      grub_memcpy (lv->name + vgname_len + 1, p, s);
-	      lv->name[vgname_len + 1 + s] = '\0';
-
-	      lv->size = 0;
-
-	      lv->segment_count = grub_lvm_getvalue (&p, "segment_count = ");
-	      if (p == NULL)
-		goto lvs_fail;
-	      lv->segments = grub_malloc (sizeof (*seg) * lv->segment_count);
-	      seg = lv->segments;
-
-	      for (i = 0; i < lv->segment_count; i++)
-		{
-		  struct grub_lvm_stripe *stripe;
-
-		  p = grub_strstr (p, "segment");
-		  if (p == NULL)
-		    goto lvs_segment_fail;
-
-		  seg->start_extent = grub_lvm_getvalue (&p, "start_extent = ");
-		  if (p == NULL)
-		    goto lvs_segment_fail;
-		  seg->extent_count = grub_lvm_getvalue (&p, "extent_count = ");
-		  if (p == NULL)
-		    goto lvs_segment_fail;
-		  seg->stripe_count = grub_lvm_getvalue (&p, "stripe_count = ");
-		  if (p == NULL)
-		    goto lvs_segment_fail;
-
-		  lv->size += seg->extent_count * vg->extent_size;
-
-		  if (seg->stripe_count != 1)
-		    seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = ");
-
-		  seg->stripes = grub_malloc (sizeof (*stripe)
-					      * seg->stripe_count);
-		  stripe = seg->stripes;
-
-		  p = grub_strstr (p, "stripes = [");
-		  if (p == NULL)
-		    goto lvs_segment_fail2;
-		  p += sizeof("stripes = [") - 1;
-
-		  for (j = 0; j < seg->stripe_count; j++)
-		    {
-		      char *pvname;
-
-		      p = grub_strchr (p, '"');
-		      if (p == NULL)
-			continue;
-		      q = ++p;
-		      while (*q != '"')
-			q++;
-
-		      s = q - p;
-
-		      pvname = grub_malloc (s + 1);
-                      if (pvname == NULL)
-                        goto lvs_segment_fail2;
-
-		      grub_memcpy (pvname, p, s);
-		      pvname[s] = '\0';
-
-		      if (vg->pvs)
-			for (pv = vg->pvs; pv; pv = pv->next)
-			  {
-			    if (! grub_strcmp (pvname, pv->name))
-			      {
-				stripe->pv = pv;
-				break;
-			      }
-			  }
-
-		      grub_free(pvname);
-
-		      stripe->start = grub_lvm_getvalue (&p, ",");
-		      if (p == NULL)
-			continue;
-
-		      stripe++;
-		    }
-
-		  seg++;
-
-		  continue;
-		lvs_segment_fail2:
-		  grub_free (seg->stripes);
-		lvs_segment_fail:
-		  goto fail4;
-		}
-
-	      if (p != NULL)
-		p = grub_strchr (p, '}');
-	      if (p == NULL)
-		goto lvs_fail;
-	      p += 3;
-
-	      lv->number = lv_count++;
-	      lv->vg = vg;
-	      lv->next = vg->lvs;
-	      vg->lvs = lv;
-
-	      continue;
-	    lvs_fail:
-	      grub_free (lv->name);
-	      grub_free (lv);
-	      goto fail4;
-	    }
-	}
-
-	vg->next = vg_list;
-	vg_list = vg;
-    }
-  else
-    {
-      grub_free (vgname);
-    }
-
-  /* Match the device we are currently reading from with the right
-     PV. */
-  if (vg->pvs)
-    for (pv = vg->pvs; pv; pv = pv->next)
-      {
-	if (! grub_memcmp (pv->id, pv_id, GRUB_LVM_ID_STRLEN))
-	  {
-	    /* This could happen to LVM on RAID, pv->disk points to the
-	       raid device, we shouldn't change it.  */
-	    if (! pv->disk)
-	      pv->disk = grub_disk_open (name);
-	    break;
-	  }
-      }
-
-  goto fail2;
-
-  /* Failure path.  */
- fail4:
-  grub_free (vg);
- fail3:
-  grub_free (vgname);
-
-  /* Normal exit path.  */
- fail2:
-  grub_free (metadatabuf);
- fail:
-  grub_disk_close (disk);
-  return 0;
-}
-
-static struct grub_disk_dev grub_lvm_dev =
-  {
-    .name = "lvm",
-    .id = GRUB_DISK_DEVICE_LVM_ID,
-    .iterate = grub_lvm_iterate,
-    .open = grub_lvm_open,
-    .close = grub_lvm_close,
-    .read = grub_lvm_read,
-    .write = grub_lvm_write,
-#ifdef GRUB_UTIL
-    .memberlist = grub_lvm_memberlist,
-#endif
-    .next = 0
-  };
-
-
-GRUB_MOD_INIT(lvm)
-{
-  grub_device_iterate (&grub_lvm_scan_device);
-  if (grub_errno)
-    {
-      grub_print_error ();
-      grub_errno = GRUB_ERR_NONE;
-    }
-
-  grub_disk_dev_register (&grub_lvm_dev);
-}
-
-GRUB_MOD_FINI(lvm)
-{
-  grub_disk_dev_unregister (&grub_lvm_dev);
-  /* FIXME: free the lvm list. */
-}

disk/raid.c

@@ -1,691 +0,0 @@
-/* raid.c - module to read RAID arrays.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/disk.h>
-#include <grub/mm.h>
-#include <grub/err.h>
-#include <grub/misc.h>
-#include <grub/raid.h>
-
-/* Linked list of RAID arrays. */
-static struct grub_raid_array *array_list;
-grub_raid5_recover_func_t grub_raid5_recover_func;
-grub_raid6_recover_func_t grub_raid6_recover_func;
-
-
-static char
-grub_is_array_readable (struct grub_raid_array *array)
-{
-  switch (array->level)
-    {
-    case 0:
-      if (array->nr_devs == array->total_devs)
-	return 1;
-      break;
-
-    case 1:
-      if (array->nr_devs >= 1)
-	return 1;
-      break;
-
-    case 4:
-    case 5:
-    case 6:
-    case 10:
-      {
-        unsigned int n;
-
-        if (array->level == 10)
-          {
-            n = array->layout & 0xFF;
-            if (n == 1)
-              n = (array->layout >> 8) & 0xFF;
-
-            n--;
-          }
-        else
-          n = array->level / 3;
-
-        if (array->nr_devs >= array->total_devs - n)
-          return 1;
-
-        break;
-      }
-    }
-
-  return 0;
-}
-
-static int
-grub_raid_iterate (int (*hook) (const char *name))
-{
-  struct grub_raid_array *array;
-
-  for (array = array_list; array != NULL; array = array->next)
-    {
-      if (grub_is_array_readable (array))
-	if (hook (array->name))
-	  return 1;
-    }
-
-  return 0;
-}
-
-#ifdef GRUB_UTIL
-static grub_disk_memberlist_t
-grub_raid_memberlist (grub_disk_t disk)
-{
-  struct grub_raid_array *array = disk->data;
-  grub_disk_memberlist_t list = NULL, tmp;
-  unsigned int i;
-
-  for (i = 0; i < array->total_devs; i++)
-    if (array->device[i])
-      {
-        tmp = grub_malloc (sizeof (*tmp));
-        tmp->disk = array->device[i];
-        tmp->next = list;
-        list = tmp;
-      }
-
-  return list;
-}
-#endif
-
-static grub_err_t
-grub_raid_open (const char *name, grub_disk_t disk)
-{
-  struct grub_raid_array *array;
-  unsigned n;
-
-  for (array = array_list; array != NULL; array = array->next)
-    {
-      if (!grub_strcmp (array->name, name))
-	if (grub_is_array_readable (array))
-	  break;
-    }
-
-  if (!array)
-    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "unknown RAID device %s",
-                       name);
-
-  disk->has_partitions = 1;
-  disk->id = array->number;
-  disk->data = array;
-
-  grub_dprintf ("raid", "%s: total_devs=%d, disk_size=%lld\n", name,
-		array->total_devs, (unsigned long long) array->disk_size);
-
-  switch (array->level)
-    {
-    case 1:
-      disk->total_sectors = array->disk_size;
-      break;
-
-    case 10:
-      n = array->layout & 0xFF;
-      if (n == 1)
-        n = (array->layout >> 8) & 0xFF;
-
-      disk->total_sectors = grub_divmod64 (array->total_devs *
-                                           array->disk_size,
-                                           n, 0);
-      break;
-
-    case 0:
-    case 4:
-    case 5:
-    case 6:
-      n = array->level / 3;
-
-      disk->total_sectors = (array->total_devs - n) * array->disk_size;
-      break;
-    }
-
-  grub_dprintf ("raid", "%s: level=%d, total_sectors=%lld\n", name,
-		array->level, (unsigned long long) disk->total_sectors);
-
-  return 0;
-}
-
-static void
-grub_raid_close (grub_disk_t disk __attribute ((unused)))
-{
-  return;
-}
-
-void
-grub_raid_block_xor (char *buf1, const char *buf2, int size)
-{
-  grub_size_t *p1;
-  const grub_size_t *p2;
-
-  p1 = (grub_size_t *) buf1;
-  p2 = (const grub_size_t *) buf2;
-  size /= GRUB_CPU_SIZEOF_VOID_P;
-
-  while (size)
-    {
-      *(p1++) ^= *(p2++);
-      size--;
-    }
-}
-
-static grub_err_t
-grub_raid_read (grub_disk_t disk, grub_disk_addr_t sector,
-		grub_size_t size, char *buf)
-{
-  struct grub_raid_array *array = disk->data;
-  grub_err_t err = 0;
-
-  switch (array->level)
-    {
-    case 0:
-    case 1:
-    case 10:
-      {
-        grub_disk_addr_t read_sector, far_ofs;
-	grub_uint32_t disknr, b, near, far, ofs;
-
-        read_sector = grub_divmod64 (sector, array->chunk_size, &b);
-        far = ofs = near = 1;
-        far_ofs = 0;
-
-        if (array->level == 1)
-          near = array->total_devs;
-        else if (array->level == 10)
-          {
-            near = array->layout & 0xFF;
-            far = (array->layout >> 8) & 0xFF;
-            if (array->layout >> 16)
-              {
-                ofs = far;
-                far_ofs = 1;
-              }
-            else
-              far_ofs = grub_divmod64 (array->disk_size,
-                                       far * array->chunk_size, 0);
-
-            far_ofs *= array->chunk_size;
-          }
-
-        read_sector = grub_divmod64 (read_sector * near, array->total_devs,
-                                     &disknr);
-
-        ofs *= array->chunk_size;
-        read_sector *= ofs;
-
-        while (1)
-          {
-            grub_size_t read_size;
-            unsigned int i, j;
-
-            read_size = array->chunk_size - b;
-            if (read_size > size)
-              read_size = size;
-
-            for (i = 0; i < near; i++)
-              {
-                unsigned int k;
-
-                k = disknr;
-                for (j = 0; j < far; j++)
-                  {
-                    if (array->device[k])
-                      {
-                        if (grub_errno == GRUB_ERR_READ_ERROR)
-                          grub_errno = GRUB_ERR_NONE;
-
-                        err = grub_disk_read (array->device[k],
-                                              read_sector + j * far_ofs + b,
-                                              0,
-                                              read_size << GRUB_DISK_SECTOR_BITS,
-                                              buf);
-                        if (! err)
-                          break;
-                        else if (err != GRUB_ERR_READ_ERROR)
-                          return err;
-                      }
-                    else
-                      err = grub_error (GRUB_ERR_READ_ERROR,
-                                        "disk missing");
-
-                    k++;
-                    if (k == array->total_devs)
-                      k = 0;
-                  }
-
-                if (! err)
-                  break;
-
-                disknr++;
-                if (disknr == array->total_devs)
-                  {
-                    disknr = 0;
-                    read_sector += ofs;
-                  }
-              }
-
-            if (err)
-              return err;
-
-            buf += read_size << GRUB_DISK_SECTOR_BITS;
-	    size -= read_size;
-	    if (! size)
-	      break;
-
-            b = 0;
-            disknr += (near - i);
-            while (disknr >= array->total_devs)
-              {
-                disknr -= array->total_devs;
-                read_sector += ofs;
-              }
-          }
-        break;
-      }
-
-    case 4:
-    case 5:
-    case 6:
-      {
-	grub_disk_addr_t read_sector;
-	grub_uint32_t b, p, n, disknr, e;
-
-        /* n = 1 for level 4 and 5, 2 for level 6.  */
-        n = array->level / 3;
-
-	/* Find the first sector to read. */
-	read_sector = grub_divmod64 (sector, array->chunk_size, &b);
-	read_sector = grub_divmod64 (read_sector, array->total_devs - n,
-                                     &disknr);
-        if (array->level >= 5)
-          {
-            grub_divmod64 (read_sector, array->total_devs, &p);
-
-            if (! (array->layout & GRUB_RAID_LAYOUT_RIGHT_MASK))
-              p = array->total_devs - 1 - p;
-
-            if (array->layout & GRUB_RAID_LAYOUT_SYMMETRIC_MASK)
-              {
-                disknr += p + n;
-              }
-            else
-              {
-                grub_uint32_t q;
-
-                q = p + (n - 1);
-                if (q >= array->total_devs)
-                  q -= array->total_devs;
-
-                if (disknr >= p)
-                  disknr += n;
-                else if (disknr >= q)
-                  disknr += q + 1;
-              }
-
-            if (disknr >= array->total_devs)
-              disknr -= array->total_devs;
-          }
-        else
-          p = array->total_devs - n;
-
-	read_sector *= array->chunk_size;
-
-	while (1)
-	  {
-            grub_size_t read_size;
-            int next_level;
-
-            read_size = array->chunk_size - b;
-            if (read_size > size)
-              read_size = size;
-
-            e = 0;
-            if (array->device[disknr])
-              {
-                /* Reset read error.  */
-                if (grub_errno == GRUB_ERR_READ_ERROR)
-                  grub_errno = GRUB_ERR_NONE;
-
-                err = grub_disk_read (array->device[disknr],
-                                      read_sector + b, 0,
-                                      read_size << GRUB_DISK_SECTOR_BITS,
-                                      buf);
-
-                if ((err) && (err != GRUB_ERR_READ_ERROR))
-                  break;
-                e++;
-              }
-            else
-              err = GRUB_ERR_READ_ERROR;
-
-	    if (err)
-              {
-                if (array->nr_devs < array->total_devs - n + e)
-                  break;
-
-                grub_errno = GRUB_ERR_NONE;
-                if (array->level == 6)
-                  {
-                    err = ((grub_raid6_recover_func) ?
-                           (*grub_raid6_recover_func) (array, disknr, p,
-                                                       buf, read_sector + b,
-                                                       read_size) :
-                           grub_error (GRUB_ERR_BAD_DEVICE,
-                                       "raid6rec is not loaded"));
-                  }
-                else
-                  {
-                    err = ((grub_raid5_recover_func) ?
-                           (*grub_raid5_recover_func) (array, disknr,
-                                                       buf, read_sector + b,
-                                                       read_size) :
-                           grub_error (GRUB_ERR_BAD_DEVICE,
-                                       "raid5rec is not loaded"));
-                  }
-
-                if (err)
-                  break;
-              }
-
-	    buf += read_size << GRUB_DISK_SECTOR_BITS;
-	    size -= read_size;
-	    if (! size)
-	      break;
-
-            b = 0;
-	    disknr++;
-
-            if (array->layout & GRUB_RAID_LAYOUT_SYMMETRIC_MASK)
-              {
-                if (disknr == array->total_devs)
-                  disknr = 0;
-
-                next_level = (disknr == p);
-              }
-            else
-              {
-                if (disknr == p)
-                  disknr += n;
-
-                next_level = (disknr >= array->total_devs);
-              }
-
-            if (next_level)
-              {
-                read_sector += array->chunk_size;
-
-                if (array->level >= 5)
-                  {
-                    if (array->layout & GRUB_RAID_LAYOUT_RIGHT_MASK)
-                      p = (p == array->total_devs - 1) ? 0 : p + 1;
-                    else
-                      p = (p == 0) ? array->total_devs - 1 : p - 1;
-
-                    if (array->layout & GRUB_RAID_LAYOUT_SYMMETRIC_MASK)
-                      {
-                        disknr = p + n;
-                        if (disknr >= array->total_devs)
-                          disknr -= array->total_devs;
-                      }
-                    else
-                      {
-                        disknr -= array->total_devs;
-                        if (disknr == p)
-                          disknr += n;
-                      }
-                  }
-                else
-                  disknr = 0;
-              }
-	  }
-      }
-      break;
-    }
-
-  return err;
-}
-
-static grub_err_t
-grub_raid_write (grub_disk_t disk __attribute ((unused)),
-		 grub_disk_addr_t sector __attribute ((unused)),
-		 grub_size_t size __attribute ((unused)),
-		 const char *buf __attribute ((unused)))
-{
-  return GRUB_ERR_NOT_IMPLEMENTED_YET;
-}
-
-static grub_err_t
-insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
-              const char *scanner_name)
-{
-  struct grub_raid_array *array = 0, *p;
-
-  /* See whether the device is part of an array we have already seen a
-     device from. */
-  for (p = array_list; p != NULL; p = p->next)
-    if ((p->uuid_len == new_array->uuid_len) &&
-        (! grub_memcmp (p->uuid, new_array->uuid, p->uuid_len)))
-      {
-        grub_free (new_array->uuid);
-        array = p;
-
-        /* Do some checks before adding the device to the array.  */
-
-        /* FIXME: Check whether the update time of the superblocks are
-           the same. */
-
-        if (array->total_devs == array->nr_devs)
-          /* We found more members of the array than the array
-             actually has according to its superblock.  This shouldn't
-             happen normally.  */
-          grub_dprintf ("raid", "array->nr_devs > array->total_devs (%d)?!?",
-			array->total_devs);
-
-        if (array->device[new_array->index] != NULL)
-          /* We found multiple devices with the same number. Again,
-             this shouldn't happen.*/
-          grub_dprintf ("raid", "Found two disks with the number %d?!?",
-			new_array->number);
-
-        if (new_array->disk_size < array->disk_size)
-          array->disk_size = new_array->disk_size;
-        break;
-      }
-
-  /* Add an array to the list if we didn't find any.  */
-  if (!array)
-    {
-      array = grub_malloc (sizeof (*array));
-      if (!array)
-        {
-          grub_free (new_array->uuid);
-          return grub_errno;
-        }
-
-      *array = *new_array;
-      array->nr_devs = 0;
-      grub_memset (&array->device, 0, sizeof (array->device));
-
-      /* Check whether we don't have multiple arrays with the same number. */
-      for (p = array_list; p != NULL; p = p->next)
-        {
-          if (p->number == array->number)
-            break;
-        }
-
-      if (p)
-        {
-          /* The number is already in use, so we need to find an new number. */
-          int i = 0;
-
-          while (1)
-            {
-              for (p = array_list; p != NULL; p = p->next)
-                {
-                  if (p->number == i)
-                    break;
-                }
-
-              if (!p)
-                {
-                  /* We found an unused number.  */
-                  array->number = i;
-                  break;
-                }
-
-              i++;
-            }
-        }
-
-      array->name = grub_xasprintf ("md%d", array->number);
-      if (! array->name)
-        {
-          grub_free (array->uuid);
-          grub_free (array);
-
-          return grub_errno;
-        }
-
-      grub_dprintf ("raid", "Found array %s (%s)\n", array->name,
-                    scanner_name);
-
-      /* Add our new array to the list.  */
-      array->next = array_list;
-      array_list = array;
-
-      /* RAID 1 doesn't use a chunksize but code assumes one so set
-	 one. */
-      if (array->level == 1)
-	array->chunk_size = 64;
-    }
-
-  /* Add the device to the array. */
-  array->device[new_array->index] = disk;
-  array->nr_devs++;
-
-  return 0;
-}
-
-static grub_raid_t grub_raid_list;
-
-static void
-free_array (void)
-{
-  struct grub_raid_array *array;
-
-  array = array_list;
-  while (array)
-    {
-      struct grub_raid_array *p;
-      int i;
-
-      p = array;
-      array = array->next;
-
-      for (i = 0; i < GRUB_RAID_MAX_DEVICES; i++)
-        if (p->device[i])
-          grub_disk_close (p->device[i]);
-
-      grub_free (p->uuid);
-      grub_free (p->name);
-      grub_free (p);
-    }
-
-  array_list = 0;
-}
-
-void
-grub_raid_register (grub_raid_t raid)
-{
-  auto int hook (const char *name);
-  int hook (const char *name)
-    {
-      grub_disk_t disk;
-      struct grub_raid_array array;
-
-      grub_dprintf ("raid", "Scanning for RAID devices on disk %s\n", name);
-
-      disk = grub_disk_open (name);
-      if (!disk)
-        return 0;
-
-      if ((disk->total_sectors != GRUB_ULONG_MAX) &&
-	  (! grub_raid_list->detect (disk, &array)) &&
-	  (! insert_array (disk, &array, grub_raid_list->name)))
-	return 0;
-
-      /* This error usually means it's not raid, no need to display
-	 it.  */
-      if (grub_errno != GRUB_ERR_OUT_OF_RANGE)
-	grub_print_error ();
-
-      grub_errno = GRUB_ERR_NONE;
-
-      grub_disk_close (disk);
-
-      return 0;
-    }
-
-  raid->next = grub_raid_list;
-  grub_raid_list = raid;
-  grub_device_iterate (&hook);
-}
-
-void
-grub_raid_unregister (grub_raid_t raid)
-{
-  grub_raid_t *p, q;
-
-  for (p = &grub_raid_list, q = *p; q; p = &(q->next), q = q->next)
-    if (q == raid)
-      {
-	*p = q->next;
-	break;
-      }
-}
-
-static struct grub_disk_dev grub_raid_dev =
-  {
-    .name = "raid",
-    .id = GRUB_DISK_DEVICE_RAID_ID,
-    .iterate = grub_raid_iterate,
-    .open = grub_raid_open,
-    .close = grub_raid_close,
-    .read = grub_raid_read,
-    .write = grub_raid_write,
-#ifdef GRUB_UTIL
-    .memberlist = grub_raid_memberlist,
-#endif
-    .next = 0
-  };
-
-
-GRUB_MOD_INIT(raid)
-{
-  grub_disk_dev_register (&grub_raid_dev);
-}
-
-GRUB_MOD_FINI(raid)
-{
-  grub_disk_dev_unregister (&grub_raid_dev);
-  free_array ();
-}

disk/raid6_recover.c

@@ -1,219 +0,0 @@
-/* raid6_recover.c - module to recover from faulty RAID6 arrays.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/disk.h>
-#include <grub/mm.h>
-#include <grub/err.h>
-#include <grub/misc.h>
-#include <grub/raid.h>
-
-static grub_uint8_t raid6_table1[256][256];
-static grub_uint8_t raid6_table2[256][256];
-
-static void
-grub_raid_block_mul (grub_uint8_t mul, char *buf, int size)
-{
-  int i;
-  grub_uint8_t *p;
-
-  p = (grub_uint8_t *) buf;
-  for (i = 0; i < size; i++, p++)
-    *p = raid6_table1[mul][*p];
-}
-
-static void
-grub_raid6_init_table (void)
-{
-  int i, j;
-
-  for (i = 0; i < 256; i++)
-    raid6_table1[i][1] = raid6_table1[1][i] = i;
-
-  for (i = 2; i < 256; i++)
-    for (j = i; j < 256; j++)
-      {
-        int n;
-        grub_uint8_t c;
-
-        n = i >> 1;
-
-        c = raid6_table1[n][j];
-        c = (c << 1) ^ ((c & 0x80) ? 0x1d : 0);
-        if (i & 1)
-          c ^= j;
-
-        raid6_table1[j][i] = raid6_table1[i][j] = c;
-      }
-
-  raid6_table2[0][0] = 1;
-  for (i = 1; i < 256; i++)
-    raid6_table2[i][i] = raid6_table1[raid6_table2[i - 1][i - 1]][2];
-
-  for (i = 0; i < 254; i++)
-    for (j = 0; j < 254; j++)
-      {
-        grub_uint8_t c, n;
-        int k;
-
-        if (i == j)
-          continue;
-
-        k = i - j;
-        if (k < 0)
-          k += 255;
-
-        c = n = raid6_table2[k][k] ^ 1;
-        for (k = 0; k < 253; k++)
-          c = raid6_table1[c][n];
-
-        raid6_table2[i][j] = raid6_table1[raid6_table2[255 - j][255 - j]][c];
-      }
-}
-
-static grub_err_t
-grub_raid6_recover (struct grub_raid_array *array, int disknr, int p,
-                    char *buf, grub_disk_addr_t sector, int size)
-{
-  int i, q, pos;
-  int bad1 = -1, bad2 = -1;
-  char *pbuf = 0, *qbuf = 0;
-
-  size <<= GRUB_DISK_SECTOR_BITS;
-  pbuf = grub_zalloc (size);
-  if (!pbuf)
-    goto quit;
-
-  qbuf = grub_zalloc (size);
-  if (!qbuf)
-    goto quit;
-
-  q = p + 1;
-  if (q == (int) array->total_devs)
-    q = 0;
-
-  pos = q + 1;
-  if (pos == (int) array->total_devs)
-    pos = 0;
-
-  for (i = 0; i < (int) array->total_devs - 2; i++)
-    {
-      if (pos == disknr)
-        bad1 = i;
-      else
-        {
-          if ((array->device[pos]) &&
-              (! grub_disk_read (array->device[pos], sector, 0, size, buf)))
-            {
-              grub_raid_block_xor (pbuf, buf, size);
-              grub_raid_block_mul (raid6_table2[i][i], buf, size);
-              grub_raid_block_xor (qbuf, buf, size);
-            }
-          else
-            {
-              /* Too many bad devices */
-              if (bad2 >= 0)
-                goto quit;
-
-              bad2 = i;
-              grub_errno = GRUB_ERR_NONE;
-            }
-        }
-
-      pos++;
-      if (pos == (int) array->total_devs)
-        pos = 0;
-    }
-
-  /* Invalid disknr or p */
-  if (bad1 < 0)
-    goto quit;
-
-  if (bad2 < 0)
-    {
-      /* One bad device */
-      if ((array->device[p]) &&
-          (! grub_disk_read (array->device[p], sector, 0, size, buf)))
-        {
-          grub_raid_block_xor (buf, pbuf, size);
-          goto quit;
-        }
-
-      if (! array->device[q])
-        {
-          grub_error (GRUB_ERR_READ_ERROR, "not enough disk to restore");
-          goto quit;
-        }
-
-      grub_errno = GRUB_ERR_NONE;
-      if (grub_disk_read (array->device[q], sector, 0, size, buf))
-        goto quit;
-
-      grub_raid_block_xor (buf, qbuf, size);
-      grub_raid_block_mul (raid6_table2[255 - bad1][255 - bad1], buf,
-                           size);
-    }
-  else
-    {
-      /* Two bad devices */
-      grub_uint8_t c;
-
-      if ((! array->device[p]) || (! array->device[q]))
-        {
-          grub_error (GRUB_ERR_READ_ERROR, "not enough disk to restore");
-          goto quit;
-        }
-
-      if (grub_disk_read (array->device[p], sector, 0, size, buf))
-        goto quit;
-
-      grub_raid_block_xor (pbuf, buf, size);
-
-      if (grub_disk_read (array->device[q], sector, 0, size, buf))
-        goto quit;
-
-      grub_raid_block_xor (qbuf, buf, size);
-
-      c = raid6_table2[bad2][bad1];
-      grub_raid_block_mul (c, qbuf, size);
-
-      c = raid6_table1[raid6_table2[bad2][bad2]][c];
-      grub_raid_block_mul (c, pbuf, size);
-
-      grub_raid_block_xor (pbuf, qbuf, size);
-      grub_memcpy (buf, pbuf, size);
-    }
-
-quit:
-  grub_free (pbuf);
-  grub_free (qbuf);
-
-  return grub_errno;
-}
-
-GRUB_MOD_INIT(raid6rec)
-{
-  grub_raid6_init_table ();
-  grub_raid6_recover_func = grub_raid6_recover;
-}
-
-GRUB_MOD_FINI(raid6rec)
-{
-  grub_raid6_recover_func = 0;
-}

disk/scsi.c

@@ -1,407 +0,0 @@
-/* scsi.c - scsi support.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/disk.h>
-#include <grub/dl.h>
-#include <grub/kernel.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-#include <grub/types.h>
-#include <grub/scsi.h>
-#include <grub/scsicmd.h>
-
-
-static grub_scsi_dev_t grub_scsi_dev_list;
-
-void
-grub_scsi_dev_register (grub_scsi_dev_t dev)
-{
-  dev->next = grub_scsi_dev_list;
-  grub_scsi_dev_list = dev;
-}
-
-void
-grub_scsi_dev_unregister (grub_scsi_dev_t dev)
-{
-  grub_scsi_dev_t *p, q;
-
-  for (p = &grub_scsi_dev_list, q = *p; q; p = &(q->next), q = q->next)
-    if (q == dev)
-      {
-        *p = q->next;
-	break;
-      }
-}
-
-
-/* Determine the the device is removable and the type of the device
-   SCSI.  */
-static grub_err_t
-grub_scsi_inquiry (grub_scsi_t scsi)
-{
-  struct grub_scsi_inquiry iq;
-  struct grub_scsi_inquiry_data iqd;
-  grub_err_t err;
-
-  iq.opcode = grub_scsi_cmd_inquiry;
-  iq.lun = scsi->lun << GRUB_SCSI_LUN_SHIFT;
-  iq.reserved = 0;
-  iq.alloc_length = 0x24; /* XXX: Hardcoded for now */
-  iq.reserved2 = 0;
-
-  err = scsi->dev->read (scsi, sizeof (iq), (char *) &iq,
-			 sizeof (iqd), (char *) &iqd);
-  if (err)
-    return err;
-
-  scsi->devtype = iqd.devtype & GRUB_SCSI_DEVTYPE_MASK;
-  scsi->removable = iqd.rmb >> GRUB_SCSI_REMOVABLE_BIT;
-
-  return GRUB_ERR_NONE;
-}
-
-/* Read the capacity and block size of SCSI.  */
-static grub_err_t
-grub_scsi_read_capacity (grub_scsi_t scsi)
-{
-  struct grub_scsi_read_capacity rc;
-  struct grub_scsi_read_capacity_data rcd;
-  grub_err_t err;
-
-  rc.opcode = grub_scsi_cmd_read_capacity;
-  rc.lun = scsi->lun << GRUB_SCSI_LUN_SHIFT;
-  grub_memset (rc.reserved, 0, sizeof (rc.reserved));
-
-  err = scsi->dev->read (scsi, sizeof (rc), (char *) &rc,
-			 sizeof (rcd), (char *) &rcd);
-  if (err)
-    return err;
-
-  scsi->size = grub_be_to_cpu32 (rcd.size);
-  scsi->blocksize = grub_be_to_cpu32 (rcd.blocksize);
-
-  return GRUB_ERR_NONE;
-}
-
-/* Send a SCSI request for DISK: read SIZE sectors starting with
-   sector SECTOR to BUF.  */
-static grub_err_t
-grub_scsi_read10 (grub_disk_t disk, grub_disk_addr_t sector,
-		  grub_size_t size, char *buf)
-{
-  grub_scsi_t scsi;
-  struct grub_scsi_read10 rd;
-
-  scsi = disk->data;
-
-  rd.opcode = grub_scsi_cmd_read10;
-  rd.lun = scsi->lun << GRUB_SCSI_LUN_SHIFT;
-  rd.lba = grub_cpu_to_be32 (sector);
-  rd.reserved = 0;
-  rd.size = grub_cpu_to_be16 (size);
-  rd.reserved2 = 0;
-  rd.pad = 0;
-
-  return scsi->dev->read (scsi, sizeof (rd), (char *) &rd, size * scsi->blocksize, buf);
-}
-
-/* Send a SCSI request for DISK: read SIZE sectors starting with
-   sector SECTOR to BUF.  */
-static grub_err_t
-grub_scsi_read12 (grub_disk_t disk, grub_disk_addr_t sector,
-		  grub_size_t size, char *buf)
-{
-  grub_scsi_t scsi;
-  struct grub_scsi_read12 rd;
-
-  scsi = disk->data;
-
-  rd.opcode = grub_scsi_cmd_read12;
-  rd.lun = scsi->lun << GRUB_SCSI_LUN_SHIFT;
-  rd.lba = grub_cpu_to_be32 (sector);
-  rd.size = grub_cpu_to_be32 (size);
-  rd.reserved = 0;
-  rd.control = 0;
-
-  return scsi->dev->read (scsi, sizeof (rd), (char *) &rd, size * scsi->blocksize, buf);
-}
-
-#if 0
-/* Send a SCSI request for DISK: write the data stored in BUF to SIZE
-   sectors starting with SECTOR.  */
-static grub_err_t
-grub_scsi_write10 (grub_disk_t disk, grub_disk_addr_t sector,
-		   grub_size_t size, char *buf)
-{
-  grub_scsi_t scsi;
-  struct grub_scsi_write10 wr;
-
-  scsi = disk->data;
-
-  wr.opcode = grub_scsi_cmd_write10;
-  wr.lun = scsi->lun << GRUB_SCSI_LUN_SHIFT;
-  wr.lba = grub_cpu_to_be32 (sector);
-  wr.reserved = 0;
-  wr.size = grub_cpu_to_be16 (size);
-  wr.reserved2 = 0;
-  wr.pad = 0;
-
-  return scsi->dev->write (scsi, sizeof (wr), (char *) &wr, size * scsi->blocksize, buf);
-}
-
-/* Send a SCSI request for DISK: write the data stored in BUF to SIZE
-   sectors starting with SECTOR.  */
-static grub_err_t
-grub_scsi_write12 (grub_disk_t disk, grub_disk_addr_t sector,
-		   grub_size_t size, char *buf)
-{
-  grub_scsi_t scsi;
-  struct grub_scsi_write10 wr;
-
-  scsi = disk->data;
-
-  wr.opcode = grub_scsi_cmd_write12;
-  wr.lun = scsi->lun << GRUB_SCSI_LUN_SHIFT;
-  wr.lba = grub_cpu_to_be32 (sector);
-  wr.size = grub_cpu_to_be32 (size);
-  wr.reserved = 0;
-  wr.pad = 0;
-
-  return scsi->dev->write (scsi, sizeof (wr), (char *) &wr, size * scsi->blocksize, buf);
-}
-#endif
-
-
-static int
-grub_scsi_iterate (int (*hook) (const char *name))
-{
-  grub_scsi_dev_t p;
-
-  auto int scsi_iterate (const char *name, int luns);
-
-  int scsi_iterate (const char *name, int luns)
-    {
-      int i;
-
-      /* In case of a single LUN, just return `usbX'.  */
-      if (luns == 1)
-	return hook (name);
-
-      /* In case of multiple LUNs, every LUN will get a prefix to
-	 distinguish it.  */
-      for (i = 0; i < luns; i++)
-	{
-	  char *sname;
-	  int ret;
-	  sname = grub_xasprintf ("%s%c", name, 'a' + i);
-	  if (!sname)
-	    return 1;
-	  ret = hook (sname);
-	  grub_free (sname);
-	  if (ret)
-	    return 1;
-	}
-      return 0;
-    }
-
-  for (p = grub_scsi_dev_list; p; p = p->next)
-    if (p->iterate && (p->iterate) (scsi_iterate))
-      return 1;
-
-  return 0;
-}
-
-static grub_err_t
-grub_scsi_open (const char *name, grub_disk_t disk)
-{
-  grub_scsi_dev_t p;
-  grub_scsi_t scsi;
-  grub_err_t err;
-  int len;
-  int lun;
-
-  scsi = grub_malloc (sizeof (*scsi));
-  if (! scsi)
-    return grub_errno;
-
-  len = grub_strlen (name);
-  lun = name[len - 1] - 'a';
-
-  /* Try to detect a LUN ('a'-'z'), otherwise just use the first
-     LUN.  */
-  if (lun < 0 || lun > 26)
-    lun = 0;
-
-  for (p = grub_scsi_dev_list; p; p = p->next)
-    {
-      if (p->open (name, scsi))
-	continue;
-
-      disk->id = (unsigned long) "scsi"; /* XXX */
-      disk->data = scsi;
-      scsi->dev = p;
-      scsi->lun = lun;
-      scsi->name = grub_strdup (name);
-      if (! scsi->name)
-	{
-	  grub_free (scsi);
-	  return grub_errno;
-	}
-
-      grub_dprintf ("scsi", "dev opened\n");
-
-      err = grub_scsi_inquiry (scsi);
-      if (err)
-	{
-	  grub_free (scsi);
-	  grub_dprintf ("scsi", "inquiry failed\n");
-	  return err;
-	}
-
-      grub_dprintf ("scsi", "inquiry: devtype=0x%02x removable=%d\n",
-		    scsi->devtype, scsi->removable);
-
-      /* Try to be conservative about the device types
-	 supported.  */
-      if (scsi->devtype != grub_scsi_devtype_direct
-	  && scsi->devtype != grub_scsi_devtype_cdrom)
-	{
-	  grub_free (scsi);
-	  return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
-			     "unknown SCSI device");
-	}
-
-      if (scsi->devtype == grub_scsi_devtype_cdrom)
-	disk->has_partitions = 0;
-      else
-	disk->has_partitions = 1;
-
-      err = grub_scsi_read_capacity (scsi);
-      if (err)
-	{
-	  grub_free (scsi);
-	  grub_dprintf ("scsi", "READ CAPACITY failed\n");
-	  return err;
-	}
-
-      /* SCSI blocks can be something else than 512, although GRUB
-	 wants 512 byte blocks.  */
-      disk->total_sectors = ((scsi->size * scsi->blocksize)
-			     << GRUB_DISK_SECTOR_BITS);
-
-      grub_dprintf ("scsi", "capacity=%llu, blksize=%d\n",
-		    (unsigned long long) disk->total_sectors,
-		    scsi->blocksize);
-
-      return GRUB_ERR_NONE;
-    }
-
-  grub_free (scsi);
-
-  return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a SCSI disk");
-}
-
-static void
-grub_scsi_close (grub_disk_t disk)
-{
-  grub_scsi_t scsi;
-
-  scsi = disk->data;
-  scsi->dev->close (scsi);
-  grub_free (scsi);
-}
-
-static grub_err_t
-grub_scsi_read (grub_disk_t disk, grub_disk_addr_t sector,
-		grub_size_t size, char *buf)
-{
-  grub_scsi_t scsi;
-
-  scsi = disk->data;
-
-  /* SCSI sectors are variable in size.  GRUB uses 512 byte
-     sectors.  */
-  if (scsi->blocksize != GRUB_DISK_SECTOR_SIZE)
-    {
-      unsigned spb = scsi->blocksize >> GRUB_DISK_SECTOR_BITS;
-      if (! (spb != 0 && (scsi->blocksize & GRUB_DISK_SECTOR_SIZE) == 0))
-	return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-			   "unsupported SCSI block size");
-
-      grub_uint32_t sector_mod = 0;
-      sector = grub_divmod64 (sector, spb, &sector_mod);
-
-      if (! (sector_mod == 0 && size % spb == 0))
-	return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-			   "unaligned SCSI read not supported");
-
-      size /= spb;
-    }
-
-  /* Depending on the type, select a read function.  */
-  switch (scsi->devtype)
-    {
-    case grub_scsi_devtype_direct:
-      return grub_scsi_read10 (disk, sector, size, buf);
-
-    case grub_scsi_devtype_cdrom:
-      return grub_scsi_read12 (disk, sector, size, buf);
-    }
-
-  /* XXX: Never reached.  */
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_scsi_write (grub_disk_t disk __attribute((unused)),
-		 grub_disk_addr_t sector __attribute((unused)),
-		 grub_size_t size __attribute((unused)),
-		 const char *buf __attribute((unused)))
-{
-#if 0
-  /* XXX: Not tested yet!  */
-
-  /* XXX: This should depend on the device type?  */
-  return grub_scsi_write10 (disk, sector, size, buf);
-#endif
-  return GRUB_ERR_NOT_IMPLEMENTED_YET;
-}
-
-
-static struct grub_disk_dev grub_scsi_dev =
-  {
-    .name = "scsi",
-    .id = GRUB_DISK_DEVICE_SCSI_ID,
-    .iterate = grub_scsi_iterate,
-    .open = grub_scsi_open,
-    .close = grub_scsi_close,
-    .read = grub_scsi_read,
-    .write = grub_scsi_write,
-    .next = 0
-  };
-
-GRUB_MOD_INIT(scsi)
-{
-  grub_disk_dev_register (&grub_scsi_dev);
-}
-
-GRUB_MOD_FINI(scsi)
-{
-  grub_disk_dev_unregister (&grub_scsi_dev);
-}

disk/usbms.c

@@ -1,394 +0,0 @@
-/* usbms.c - USB Mass Storage Support.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can 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.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/mm.h>
-#include <grub/usb.h>
-#include <grub/scsi.h>
-#include <grub/scsicmd.h>
-#include <grub/misc.h>
-
-#define GRUB_USBMS_DIRECTION_BIT	7
-
-/* The USB Mass Storage Command Block Wrapper.  */
-struct grub_usbms_cbw
-{
-  grub_uint32_t signature;
-  grub_uint32_t tag;
-  grub_uint32_t transfer_length;
-  grub_uint8_t flags;
-  grub_uint8_t lun;
-  grub_uint8_t length;
-  grub_uint8_t cbwcb[16];
-} __attribute__ ((packed));
-
-struct grub_usbms_csw
-{
-  grub_uint32_t signature;
-  grub_uint32_t tag;
-  grub_uint32_t residue;
-  grub_uint8_t status;
-} __attribute__ ((packed));
-
-struct grub_usbms_dev
-{
-  struct grub_usb_device *dev;
-
-  int luns;
-
-  int interface;
-  struct grub_usb_desc_endp *in;
-  struct grub_usb_desc_endp *out;
-
-  int in_maxsz;
-  int out_maxsz;
-
-  struct grub_usbms_dev *next;
-};
-typedef struct grub_usbms_dev *grub_usbms_dev_t;
-
-static grub_usbms_dev_t grub_usbms_dev_list;
-
-static int devcnt;
-
-static grub_err_t
-grub_usbms_reset (grub_usb_device_t dev, int interface)
-{
-  return grub_usb_control_msg (dev, 0x21, 255, 0, interface, 0, 0);
-}
-
-static void
-grub_usbms_finddevs (void)
-{
-  auto int usb_iterate (grub_usb_device_t dev);
-
-  int usb_iterate (grub_usb_device_t usbdev)
-    {
-      grub_usb_err_t err;
-      struct grub_usb_desc_device *descdev = &usbdev->descdev;
-      int i;
-
-      if (descdev->class != 0 || descdev->subclass || descdev->protocol != 0)
-	return 0;
-
-      /* XXX: Just check configuration 0 for now.  */
-      for (i = 0; i < usbdev->config[0].descconf->numif; i++)
-	{
-	  struct grub_usbms_dev *usbms;
-	  struct grub_usb_desc_if *interf;
-	  int j;
-	  grub_uint8_t luns;
-
-	  interf = usbdev->config[0].interf[i].descif;
-
-	  /* If this is not a USB Mass Storage device with a supported
-	     protocol, just skip it.  */
-	  if (interf->class != GRUB_USB_CLASS_MASS_STORAGE
-	      || interf->subclass != GRUB_USBMS_SUBCLASS_BULK
-	      || interf->protocol != GRUB_USBMS_PROTOCOL_BULK)
-	    {
-	      continue;
-	    }
-
-	  devcnt++;
-	  usbms = grub_zalloc (sizeof (struct grub_usbms_dev));
-	  if (! usbms)
-	    return 1;
-
-	  usbms->dev = usbdev;
-	  usbms->interface = i;
-
-	  /* Iterate over all endpoints of this interface, at least a
-	     IN and OUT bulk endpoint are required.  */
-	  for (j = 0; j < interf->endpointcnt; j++)
-	    {
-	      struct grub_usb_desc_endp *endp;
-	      endp = &usbdev->config[0].interf[i].descendp[j];
-
-	      if ((endp->endp_addr & 128) && (endp->attrib & 3) == 2)
-		{
-		  /* Bulk IN endpoint.  */
-		  usbms->in = endp;
-		  grub_usb_clear_halt (usbdev, endp->endp_addr & 128);
-		  usbms->in_maxsz = endp->maxpacket;
-		}
-	      else if (!(endp->endp_addr & 128) && (endp->attrib & 3) == 2)
-		{
-		  /* Bulk OUT endpoint.  */
-		  usbms->out = endp;
-		  grub_usb_clear_halt (usbdev, endp->endp_addr & 128);
-		  usbms->out_maxsz = endp->maxpacket;
-		}
-	    }
-
-	  if (!usbms->in || !usbms->out)
-	    {
-	      grub_free (usbms);
-	      return 0;
-	    }
-
-	  /* Query the amount of LUNs.  */
-	  err = grub_usb_control_msg (usbdev, 0xA1, 254,
-				      0, i, 1, (char *) &luns);
-	  if (err)
-	    {
-	      /* In case of a stall, clear the stall.  */
-	      if (err == GRUB_USB_ERR_STALL)
-		{
-		  grub_usb_clear_halt (usbdev, usbms->in->endp_addr & 3);
-		  grub_usb_clear_halt (usbdev, usbms->out->endp_addr & 3);
-		}
-
-	      /* Just set the amount of LUNs to one.  */
-	      grub_errno = GRUB_ERR_NONE;
-	      usbms->luns = 1;
-	    }
-	  else
-	    usbms->luns = luns;
-
-	  /* XXX: Check the magic values, does this really make
-	     sense?  */
-	  grub_usb_control_msg (usbdev, (1 << 6) | 1, 255,
-				0, i, 0, 0);
-
-	  /* XXX: To make Qemu work?  */
-	  if (usbms->luns == 0)
-	    usbms->luns = 1;
-
-	  usbms->next = grub_usbms_dev_list;
-	  grub_usbms_dev_list = usbms;
-
-	  /* XXX: Activate the first configuration.  */
-	  grub_usb_set_configuration (usbdev, 1);
-
-	  /* Bulk-Only Mass Storage Reset, after the reset commands
-	     will be accepted.  */
-	  grub_usbms_reset (usbdev, i);
-
-	  return 0;
-	}
-
-      return 0;
-    }
-
-  grub_usb_iterate (usb_iterate);
-}
-
-
-
-static int
-grub_usbms_iterate (int (*hook) (const char *name, int luns))
-{
-  grub_usbms_dev_t p;
-  int cnt = 0;
-
-  for (p = grub_usbms_dev_list; p; p = p->next)
-    {
-      char *devname;
-      devname = grub_xasprintf ("usb%d", cnt);
-
-      if (hook (devname, p->luns))
-	{
-	  grub_free (devname);
-	  return 1;
-	}
-      grub_free (devname);
-      cnt++;
-    }
-
-  return 0;
-}
-
-static grub_err_t
-grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
-		     grub_size_t size, char *buf, int read_write)
-{
-  struct grub_usbms_cbw cbw;
-  grub_usbms_dev_t dev = (grub_usbms_dev_t) scsi->data;
-  struct grub_usbms_csw status;
-  static grub_uint32_t tag = 0;
-  grub_usb_err_t err = GRUB_USB_ERR_NONE;
-  int retrycnt = 3 + 1;
-
- retry:
-  retrycnt--;
-  if (retrycnt == 0)
-    return grub_error (GRUB_ERR_IO, "USB Mass Storage stalled");
-
-  /* Setup the request.  */
-  grub_memset (&cbw, 0, sizeof (cbw));
-  cbw.signature = grub_cpu_to_le32 (0x43425355);
-  cbw.tag = tag++;
-  cbw.transfer_length = grub_cpu_to_le32 (size);
-  cbw.flags = (!read_write) << GRUB_USBMS_DIRECTION_BIT;
-  cbw.lun = scsi->lun << GRUB_SCSI_LUN_SHIFT;
-  cbw.length = cmdsize;
-  grub_memcpy (cbw.cbwcb, cmd, cmdsize);
-
-  /* Write the request.  */
-  err = grub_usb_bulk_write (dev->dev, dev->out->endp_addr & 15,
-			     sizeof (cbw), (char *) &cbw);
-  if (err)
-    {
-      if (err == GRUB_USB_ERR_STALL)
-	{
-	  grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
-	  goto retry;
-	}
-      return grub_error (GRUB_ERR_IO, "USB Mass Storage request failed");
-    }
-
-  /* Read/write the data.  */
-  if (read_write == 0)
-    {
-      err = grub_usb_bulk_read (dev->dev, dev->in->endp_addr & 15, size, buf);
-      grub_dprintf ("usb", "read: %d %d\n", err, GRUB_USB_ERR_STALL);
-      if (err)
-	{
-	  if (err == GRUB_USB_ERR_STALL)
-	    {
-	      grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
-	      goto retry;
-	    }
-	  return grub_error (GRUB_ERR_READ_ERROR,
-			     "can't read from USB Mass Storage device");
-	}
-    }
-  else
-    {
-      err = grub_usb_bulk_write (dev->dev, dev->in->endp_addr & 15, size, buf);
-      grub_dprintf ("usb", "write: %d %d\n", err, GRUB_USB_ERR_STALL);
-      if (err)
-	{
-	  if (err == GRUB_USB_ERR_STALL)
-	    {
-	      grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
-	      goto retry;
-	    }
-	  return grub_error (GRUB_ERR_WRITE_ERROR,
-			     "can't write to USB Mass Storage device");
-	}
-    }
-
-  /* Read the status.  */
-  err = grub_usb_bulk_read (dev->dev, dev->in->endp_addr & 15,
-			    sizeof (status), (char *) &status);
-  if (err)
-    {
-      if (err == GRUB_USB_ERR_STALL)
-	{
-	  grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
-	  goto retry;
-	}
-      return grub_error (GRUB_ERR_READ_ERROR,
-			 "can't read status from USB Mass Storage device");
-    }
-
-  /* XXX: Magic and check this code.  */
-  if (status.status == 2)
-    {
-      /* XXX: Phase error, reset device.  */
-      grub_usbms_reset (dev->dev, dev->interface);
-      grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
-      grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
-
-      goto retry;
-    }
-
-  if (status.status)
-    return grub_error (GRUB_ERR_READ_ERROR,
-		       "error communication with USB Mass Storage device");
-
-  return GRUB_ERR_NONE;
-}
-
-
-static grub_err_t
-grub_usbms_read (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
-		 grub_size_t size, char *buf)
-{
-  return grub_usbms_transfer (scsi, cmdsize, cmd, size, buf, 0);
-}
-
-static grub_err_t
-grub_usbms_write (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
-		  grub_size_t size, char *buf)
-{
-  return grub_usbms_transfer (scsi, cmdsize, cmd, size, buf, 1);
-}
-
-static grub_err_t
-grub_usbms_open (const char *name, struct grub_scsi *scsi)
-{
-  grub_usbms_dev_t p;
-  int devnum;
-  int i = 0;
-
-  if (grub_strncmp (name, "usb", 3))
-    return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
-		       "not a USB Mass Storage device");
-
-  devnum = grub_strtoul (name + 3, NULL, 10);
-  for (p = grub_usbms_dev_list; p; p = p->next)
-    {
-      /* Check if this is the devnumth device.  */
-      if (devnum == i)
-	{
-	  scsi->data = p;
-	  scsi->name = grub_strdup (name);
-	  scsi->luns = p->luns;
-	  if (! scsi->name)
-	    return grub_errno;
-
-	  return GRUB_ERR_NONE;
-	}
-
-      i++;
-    }
-
-  return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
-		     "not a USB Mass Storage device");
-}
-
-static void
-grub_usbms_close (struct grub_scsi *scsi)
-{
-  grub_free (scsi->name);
-}
-
-static struct grub_scsi_dev grub_usbms_dev =
-  {
-    .name = "usb",
-    .iterate = grub_usbms_iterate,
-    .open = grub_usbms_open,
-    .close = grub_usbms_close,
-    .read = grub_usbms_read,
-    .write = grub_usbms_write
-  };
-
-GRUB_MOD_INIT(usbms)
-{
-  grub_usbms_finddevs ();
-  grub_scsi_dev_register (&grub_usbms_dev);
-}
-
-GRUB_MOD_FINI(usbms)
-{
-  grub_scsi_dev_unregister (&grub_usbms_dev);
-}

docs/Makefile.am

@@ -0,0 +1,9 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
+# AM_MAKEINFOFLAGS = --no-split --no-validate
+info_TEXINFOS = grub.texi grub-dev.texi
+grub_TEXINFOS = fdl.texi
+
+EXTRA_DIST = font_char_metrics.png font_char_metrics.txt
+
+

docs/autoiso.cfg

@@ -0,0 +1,244 @@
+# Sample GRUB script to autodetect operating systems
+#
+# Copyright (C) 2010  Free Software Foundation, Inc.
+#
+# GRUB is free software: you can 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.
+#
+# GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
+
+function pathname { regexp -s 2:"$2" '^(\(.*\))?(/.*)$' "$1"; }
+function devname  { regexp -s "$2" '^(\(.*\)).*$' "$1"; }
+
+function loopback_iso_entry {
+    realdev="$1"
+    isopath="$2"
+    loopdev="$3"
+
+    if test -f /boot/grub/loopback.cfg; then
+	cfgpath=/boot/grub/loopback.cfg
+    elif test -f /grub/loopback.cfg; then
+	cfgpath=/grub/loopback.cfg
+    else
+	return 1;
+    fi
+
+    echo loopback.cfg $isopath: yes
+    menuentry "Boot GRUB Loopback Config from ${realdev}${isopath}" "$realdev" "$isopath" "$cfgpath" {
+	set device="$2"
+	set iso_path="$3"
+	set cfg_path="$4"
+
+	export iso_path
+	loopback loopdev_cfg "${device}${iso_path}"
+	set root=(loopdev_cfg)
+	configfile $cfg_path
+	loopback -d loopdev_cfg
+    }
+    return 0
+}
+
+function grml_iso_entry {
+    realdev="$1"
+    isopath="$2"
+    loopdev="$3"
+
+    result=1
+    for dir in /boot/grml /boot/grmlsmall /boot/grmlmedium; do
+	if ! test -f ${dir}/linux26 -a -f ${dir}/initrd.gz; then continue; fi
+
+	echo grml $isopath: yes
+	result=0
+	menuentry "GRML Linux from ${realdev}${isopath}" \
+	    "$realdev" "$isopath" "$dir" {
+	    set device="$2"
+	    set isopath="$3"
+	    set grmldir="$4"
+
+	    loopback loopdev_grml "${device}${isopath}"
+	    set root=(loopdev_grml)
+	    linux $grmldir/linux26 findiso="$isopath" apm=power-off quiet \
+		boot=live nomce
+	    initrd $grmldir/initrd.gz
+	    loopback -d loopdev_grml
+	}
+    done
+    return $result
+}
+
+function pmagic_iso_entry {
+    realdev="$1"
+    isopath="$2"
+    loopdev="$3"
+
+    if ! test -f /pmagic/bzImage -a -f /pmagic/initramfs; then return 1; fi
+
+    echo pmagic $isopath: yes
+    menuentry "Parted Magic from ${realdev}${isopath}" "$realdev" "$isopath" {
+	set device="$2"
+	set isopath="$3"
+
+	loopback loopdev_pmagic "${device}${isopath}"
+	set root=(loopdev_pmagic)
+	linux /pmagic/bzImage iso_filename="$isopath" edd=off noapic \
+	    load_ramdisk=1 prompt_ramdisk=0 rw sleep=10 loglevel=0 \
+	    keymap=$langcode
+	initrd /pmagic/initramfs
+	loopback -d loopdev_pmagic
+    }
+    return 0
+}
+
+function sidux_iso_entry {
+    realdev="$1"
+    isopath="$2"
+    loopdev="$3"
+
+    result=1
+    for kernel in /boot/vmlinuz-*-sidux-*; do
+	if ! test -f "$kernel"; then continue; fi
+	regexp -s 1:v1 -s 2:v2 '/boot/vmlinuz-(.*)-sidux-(.*)' "$kernel"
+
+	initrd="/boot/initrd.img-$v1-sidux-$v2"
+	if ! test -f "$initrd"; then continue; fi
+
+	result=0
+	echo sidux $isopath: yes
+	menuentry "Sidux vmlinux-$v1-sidux-$v2 from ${realdev}${isopath}" "$realdev" "$isopath" "$kernel" "$initrd" {
+	    set device="$2"
+	    set isopath="$3"
+	    set kernel="$4"
+	    set initrd="$5"
+
+	    loopback loopdev_sidux "${device}${isopath}"
+	    set root=(loopdev_sidux)
+	    linux $kernel fromiso=$isopath boot=fll quiet
+	    initrd $initrd
+	    loopback -d loopdev_sidux
+	}
+    done
+    return $result
+}
+
+function slax_iso_entry {
+    realdev="$1"
+    isopath="$2"
+    loopdev="$3"
+
+    if ! test -f /boot/vmlinuz -a -f /boot/initrd.gz; then return 1; fi
+
+    echo slax $isopath: yes
+    menuentry "Slax Linux from ${realdev}${isopath}" "$realdev" "$isopath" {
+	set device="$2"
+	set isopath="$3"
+
+	loopback loopdev_slax "${device}${isopath}"
+	set root=(loopdev_slax)
+	linux /boot/vmlinuz from=$isopath ramdisk_size=6666 root=/dev/ram0 rw
+	initrd /boot/initrd.gz
+	loopback -d loopdev_slax
+    }
+    return 0
+}
+
+function tinycore_iso_entry {
+    realpath="$1"
+    isopath="$2"
+    loopdev="$3"
+
+    if ! test -f /boot/bzImage -a -f /boot/tinycore.gz; then return 1; fi
+
+    echo tinycore $isopath: yes
+    menuentry "Tinycore Linux from ${realdev}${isopath}" "$realdev" "$isopath" {
+	set device="$2"
+	set isopath="$3"
+
+	loopback loopdev_tiny "${device}${isopath}"
+	set root=(loopdev_tiny)
+	linux /boot/bzImage
+	initrd /boot/tinycore.gz
+	loopback -d loopdev_tiny
+    }
+    return 0
+}
+
+function casper_iso_entry {
+    realpath="$1"
+    isopath="$2"
+    loopdev="$3"
+
+    if ! test -f /casper/vmlinuz; then return 1; fi
+    initrd=
+    for f in /casper/initrd.*z; do
+	if ! test -f "$f"; then continue; fi
+	pathname "$f" initrd
+    done
+    if test -z "$initrd"; then return 1; fi
+
+    echo casper $isopath: yes
+    menuentry "Casper based Linux from ${realdev}${isopath}" "$realdev" "$isopath" "$initrd" {
+	set device="$2"
+	set isopath="$3"
+	set initrd="$4"
+
+	loopback loopdev_casper "${device}${isopath}"
+	set root=(loopdev_casper)
+	linux /casper/vmlinuz boot=casper iso-scan/filename="$isopath" quiet splash noprompt keyb="$langcode" \
+	    debian-installer/language="$langcode" console-setup/layoutcode?="$langcode" --
+	initrd $initrd
+	loopback -d loopdev_casper
+    }
+    return 0
+}
+
+function scan_isos {
+    isodirs="$1"
+
+    for dev in (*); do
+	for dir in $isodirs; do
+	    for file in ${dev}${dir}/*.iso ${dev}${dir}/*.ISO; do
+		if ! test -f "$file"; then continue; fi
+
+		pathname $file isopath
+		if test -z "$dev" -o -z "$isopath"; then continue; fi
+
+		if ! loopback loopdev_scan "$file"; then continue; fi
+		saved_root=$root
+		set root=(loopdev_scan)
+
+		if   loopback_iso_entry $dev $isopath (loopdev_scan); then true;
+		elif grml_iso_entry     $dev $isopath (loopdev_scan); then true;
+		elif pmagic_iso_entry   $dev $isopath (loopdev_scan); then true;
+		elif sidux_iso_entry    $dev $isopath (loopdev_scan); then true;
+		elif slax_iso_entry     $dev $isopath (loopdev_scan); then true;
+		elif tinycore_iso_entry $dev $isopath (loopdev_scan); then true;
+		elif casper_iso_entry   $dev $isopath (loopdev_scan); then true;
+		else true; fi
+
+		set root=$saved_root
+		loopback -d loopdev_scan
+	    done
+	done
+    done
+    return 0
+}
+
+# XXX Remove later
+insmod serial
+serial
+terminal_output --append serial
+# terminal_input --append serial
+
+langcode="$lang"
+
+insmod regexp
+scan_isos /iso /boot/iso
+

docs/font_char_metrics.txt

@@ -0,0 +1 @@
+Please fill this in.

docs/grub.cfg

@@ -5,15 +5,22 @@
 # Boot automatically after 30 secs.
 set timeout=30
 
-# By default, boot the first entry.
-set default=0
+# By default, boot the GNU/Linux
+set default=gnulinux
 
-# Fallback to the second entry.
-set fallback=1
+# Fallback to GNU/Hurd.
+set fallback=gnuhurd
+
+# For booting GNU/Linux
+menuentry "GNU/Linux" --id gnulinux {
+	set root=(hd0,msdos1)
+	linux /vmlinuz root=/dev/sda1
+	initrd /initrd.img
+}
 
 # For booting GNU/Hurd
-menuentry "GNU (aka GNU/Hurd)" {
-	set root=(hd0,1)
+menuentry "GNU (aka GNU/Hurd)" --id gnuhurd {
+	set root=(hd0,msdos1)
 	multiboot /boot/gnumach.gz root=device:hd0s1
 	module /hurd/ext2fs.static ext2fs --readonly \
 			--multiboot-command-line='${kernel-command-line}' \
@@ -24,41 +31,35 @@ menuentry "GNU (aka GNU/Hurd)" {
 	module /lib/ld.so.1 exec /hurd/exec '$(exec-task=task-create)'
 }
 
-# For booting GNU/Linux
-menuentry "GNU/Linux" {
-	set root=(hd0,1)
-	linux /vmlinuz root=/dev/sda1
-	initrd /initrd.img
-}
-
 # For booting FreeBSD
 menuentry "FreeBSD (or GNU/kFreeBSD), direct boot" {
-	set root=(hd0,1,a)
+	set root=(hd0,msdos1,bsd1)
 	kfreebsd /boot/kernel/kernel
 	kfreebsd_loadenv /boot/device.hints
 	kfreebsd_module /boot/splash.bmp type=splash_image_data
 	set kFreeBSD.vfs.root.mountfrom=ufs:ad0s1a
 }
+
 menuentry "FreeBSD (or GNU/kFreeBSD), via /boot/loader" {
-	set root=(hd0,1,a)
+	set root=(hd0,msdos1,bsd1)
 	kfreebsd /boot/loader
 }
 
 # For booting NetBSD
 menuentry "NetBSD" {
-	set root=(hd0,1,a)
+	set root=(hd0,netbsd1)
 	knetbsd /netbsd
 }
 
 # For booting OpenBSD
 menuentry "OpenBSD" {
-	set root=(hd0,1,a)
+	set root=(hd0,openbsd1)
 	kopenbsd /bsd
 }
 
 # For booting Microsoft Windows
 menuentry "Microsoft Windows" {
-	set root=(hd0,1)
+	set root=(hd0,msdos1)
 	chainloader +1
 }
 

docs/man/grub-bios-setup.h2m

@@ -0,0 +1,6 @@
+[NAME]
+grub-bios-setup \- set up a device to boot using GRUB
+[SEE ALSO]
+.BR grub-install (8),
+.BR grub-mkimage (1),
+.BR grub-mkrescue (1)

docs/man/grub-editenv.h2m

@@ -0,0 +1,5 @@
+[NAME]
+grub-editenv \- edit GRUB environment block
+[SEE ALSO]
+.BR grub-reboot (8),
+.BR grub-set-default (8)

docs/man/grub-emu.h2m

@@ -0,0 +1,6 @@
+[NAME]
+grub-emu \- GRUB emulator
+[SEE ALSO]
+If you are trying to install GRUB, then you should use
+.BR grub-install (8)
+rather than this program.

docs/man/grub-fstest.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-fstest \- debug tool for GRUB filesystem drivers
+[SEE ALSO]
+.BR grub-probe (8)

docs/man/grub-glue-efi.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-glue-efi \- generate a fat binary for EFI
+[DESCRIPTION]
+grub-glue-efi processes ia32 and amd64 EFI images and glues them according to Apple format.

docs/man/grub-install.h2m

@@ -0,0 +1,6 @@
+[NAME]
+grub-install \- install GRUB to a device
+[SEE ALSO]
+.BR grub-mkconfig (8),
+.BR grub-mkimage (1),
+.BR grub-mkrescue (1)

docs/man/grub-kbdcomp.h2m

@@ -0,0 +1,10 @@
+[NAME]
+grub-kbdcomp \- generate a GRUB keyboard layout file
+[DESCRIPTION]
+grub-kbdcomp processes a X keyboard layout description in
+.BR keymaps (5)
+format into a format that can be used by GRUB's
+.B keymap
+command.
+[SEE ALSO]
+.BR grub-mklayout (8)

docs/man/grub-macho2img.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-macho2img \- convert Mach-O to raw image
+[SEE ALSO]
+.BR grub-mkimage (1)

docs/man/grub-menulst2cfg.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-menulst2cfg \- transform legacy menu.lst into grub.cfg
+[SEE ALSO]
+.BR grub-mkconfig (8)

docs/man/grub-mkconfig.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-mkconfig \- generate a GRUB configuration file
+[SEE ALSO]
+.BR grub-install (8)

docs/man/grub-mkfont.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-mkfont \- make GRUB font files
+[SEE ALSO]
+.BR grub-mkconfig (8)

docs/man/grub-mkimage.h2m

@@ -0,0 +1,6 @@
+[NAME]
+grub-mkimage \- make a bootable image of GRUB
+[SEE ALSO]
+.BR grub-install (8),
+.BR grub-mkrescue (1),
+.BR grub-mknetdir (8)

docs/man/grub-mklayout.h2m

@@ -0,0 +1,10 @@
+[NAME]
+grub-mklayout \- generate a GRUB keyboard layout file
+[DESCRIPTION]
+grub-mklayout processes a keyboard layout description in
+.BR keymaps (5)
+format into a format that can be used by GRUB's
+.B keymap
+command.
+[SEE ALSO]
+.BR grub-mkconfig (8)

docs/man/grub-mknetdir.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-mknetdir \- prepare a GRUB netboot directory.
+[SEE ALSO]
+.BR grub-mkimage (1)

docs/man/grub-mkpasswd-pbkdf2.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-mkpasswd-pbkdf2 \- generate hashed password for GRUB
+[SEE ALSO]
+.BR grub-mkconfig (8)

docs/man/grub-mkrelpath.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-mkrelpath \- make a system path relative to its root
+[SEE ALSO]
+.BR grub-probe (8)

docs/man/grub-mkrescue.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-mkrescue \- make a GRUB rescue image
+[SEE ALSO]
+.BR grub-mkimage (1)

docs/man/grub-mkstandalone.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-mkstandalone \- make a memdisk-based GRUB image
+[SEE ALSO]
+.BR grub-mkimage (1)

docs/man/grub-mount.h2m

@@ -0,0 +1,2 @@
+[NAME]
+grub-mount \- export GRUB filesystem with FUSE

docs/man/grub-ofpathname.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-ofpathname \- find OpenBOOT path for a device
+[SEE ALSO]
+.BR grub-probe (8)

docs/man/grub-pe2elf.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-pe2elf \- convert PE image to ELF
+[SEE ALSO]
+.BR grub-mkimage (1)

docs/man/grub-probe.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-probe \- probe device information for GRUB
+[SEE ALSO]
+.BR grub-fstest (1)

docs/man/grub-reboot.h2m

@@ -0,0 +1,5 @@
+[NAME]
+grub-reboot \- set the default boot entry for GRUB, for the next boot only
+[SEE ALSO]
+.BR grub-set-default (8),
+.BR grub-editenv (1)

docs/man/grub-render-label.h2m

@@ -0,0 +1,3 @@
+[NAME]
+grub-render-label \- generate a .disk_label for Apple Macs.
+

docs/man/grub-script-check.h2m

@@ -0,0 +1,4 @@
+[NAME]
+grub-script-check \- check grub.cfg for syntax errors
+[SEE ALSO]
+.BR grub-mkconfig (8)

docs/man/grub-set-default.h2m

@@ -0,0 +1,5 @@
+[NAME]
+grub-set-default \- set the saved default boot entry for GRUB
+[SEE ALSO]
+.BR grub-reboot (8),
+.BR grub-editenv (1)

docs/man/grub-sparc64-setup.h2m

@@ -0,0 +1,6 @@
+[NAME]
+grub-sparc64-setup \- set up a device to boot using GRUB
+[SEE ALSO]
+.BR grub-install (8),
+.BR grub-mkimage (1),
+.BR grub-mkrescue (1)