* grub-core/loader/i386/pc/plan9.c (fill_disk): Fix types to use
intended shifts rather than division.

* include/grub/datetime.h (grub_datetime2unixtime): Fix unixtime
computation for some years before epoch. Avode confusing division
while on it.

* grub-core/video/i386/pc/vbe.c
(grub_video_vbe_print_adapter_specific_info): Replace division by
shifts.

Adjust types in gdb module to have intended unsigned shifts rather than
signed divisions.

* grub-core/fs/hfs.c (grub_hfs_read_file): Avoid divmod64 since the
maximum size is 4G - 1 on hfs

Avoid costly 64-bit division in grub_get_time_ms on most platforms.

* grub-core/fs/fshelp.c (grub_fshelp_log2blksize): Remove now unused
function.

* grub-core/fs/iso9660.c (add_part): Remove always_inline attribute
causing gcc error with gcc 4.7.1.

* grub-core/commands/acpi.c (grub_acpi_create_ebda): Don't
dereference null pointer. While the code is technically correct, gcc
may eliminate a null check if pointer is already dereferenced.

* grub-core/normal/crypto.c (read_crypto_list): Fix incorrect
OOM check.
* grub-core/normal/term.c (read_terminal_list): Likewise.

Lift up core size limits on some platforms. Fix potential memory
corruption with big core on small memory systems. Document remaining
limits.

* grub-core/term/terminfo.c (grub_terminfo_cls): Issue an explicit
gotoxy to 0,0.

Remove all trampoline support. Add -Wtrampolines when
present. Remove symbols used for trampolines to make
link fail if trampolines are present.

* grub-core/script/execute.c (grub_script_arglist_to_argv): Move
append out of its parent.

* grub-core/commands/regexp.c (set_matches): Move setvar out of its
parent.

* grub-core/kern/env.c, include/grub/env.h: Change iterator through
all vars to a macro. All users updated.

* grub-core/disk/ieee1275/nand.c: Fix compilation on
i386-ieee1275.

* include/grub/cmos.h: Handle high CMOS addresses on sparc64.

* include/grub/mips/loongson/cmos.h: Fix high CMOS addresses.

Move to more hookless approach in IEEE1275 devices handling.

* grub-core/kern/term.c (grub_term_normal_color),
(grub_term_highlight_color): Add back lost defaults.

Make elfload not use hooks. Opt for flags and iterators instead.

* grub-core/lib/ia64/longjmp.S: Fix the name of longjmp function.
* grub-core/lib/ia64/setjmp.S: Fix the name of setjmp function.

* grub-core/script/execute.c (gettext_append): Remove nested functions.

* grub-core/normal/charset.c (grub_bidi_logical_to_visual): Add
hook pass-through parameter. All users updated and unnested.

* grub-core/commands/loadenv.c (grub_cmd_list_env): Move print_var
out of its parent.

* grub-core/fs/hfs.c: Remove nested functions.

* grub-core/fs/hfsplus.c (grub_hfsplus_btree_iterate_node): Pass
the context through.
(grub_hfsplus_iterate_dir): Move nested function out of its parent.

* util/grub-editenv.c (list_variables): Move print_var out of its
parent.

* grub-core/kern/emu/hostdisk.c (read_device_map): Remove nested
function.

* grub-core/gentrigtables.c: Make tables const.

Remove nested functions from videoinfo iterators.

* grub-core/loader/i386/pc/linux.c (grub_cmd_linux): Fix compilation
for 64-bit platforms.

* grub-core/disk/efi/efidisk.c: Transform iterate_child_devices into
a FOR_CHILDREN macro.

* grub-core/kern/main.c (grub_set_prefix_and_root): Strip trailing
platform from firmware path.

Enable linux16 on non-BIOS systems for i.a. memtest.

* grub-core/loader/i386/pc/linux.c (grub_cmd_linux): Handle hole at 0
correctly.
* grub-core/Makefile.core.def (linux16): Enable on all x86 flavours.

* grub-core/kern/i386/coreboot/mmap.c (grub_linuxbios_table_iterate):
Fix end of table condition.

* grub-core/lib/arg.c (grub_arg_show_help): Move showargs
out of its parent.

* grub-core/fs/jfs.c: Remove nested functions.

* grub-core/fs/minix.c: Remove nested functions.

* grub-core/fs/iso9660.c: Remove nested functions.

* grub-core/commands/parttool.c (grub_cmd_parttool): Move show_help out
of parent function.

* util/grub-fstest.c: Remove nested functions.

* grub-core/loader/machoXX.c: Remove nested functions.

Remove nested functions from disk and file read hooks.

* include/grub/disk.h (grub_disk_read_hook_t): New type.
(struct grub_disk): Add read_hook_data member.
* include/grub/file.h (struct grub_file): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Add read_hook_data
argument.

Update all callers.

* grub-core/partmap/msdos.c (grub_partition_msdos_iterate):
Fix off by one error in enumerating extended partitions.

* grub-core/disk/efi/efidisk.c(grub_efidisk_get_device_name): Fix
memory leak if device name is not found.

* grub-core/normal/menu_entry.c (update_screen): remove
unused variable `off' which caused scroll down arrow to be always shown.

* grub-core/normal/menu_entry.c (insert_string): fix off by one
access to unallocated memory.

* Makefile.util.def: Add partmap/msdos.c to common library.
* include/grub/msdos_partition.h: Add GRUB_PC_PARTITION_TYPE_LDM
* grub-core/disk/ldm.c: Check for existence of
GRUB_PC_PARTITION_TYPE_LDM.

* grub-core/normal/misc.c (grub_normal_print_device_info): Use KiB to display
sizes and display sector size.

Implement new command cmosdump.

Support Openfirmware disks with non-512B sectors.

* grub-core/disk/ieee1275/ofdisk.c (grub_ofdisk_open): Get the block
size of the disk.
* (grub_ofdisk_get_block_size): New function.
* (grub_ofdisk_prepare): Use the correct block size.
* (grub_ofdisk_read): Likewise.
* (grub_ofdisk_write): Likewise.
* include/grub/ieee1275/ofdisk.h (grub_ofdisk_get_block_size):
New proto.

* grub-core/commands/lsacpi.c: Fix types on 64-bit platform.

* grub-core/disk/cryptodisk.c (grub_cryptodisk_scan_device): Don't stop
on first error.

* grub-core/fs/fshelp.c (find_file): Set oldnode to zero after
freeing it.

Implement USBDebug (full USB stack variant).

Missing part of last commit

* grub-core/commands/lsacpi.c: Show more info. Hide some boring parts
unless they have unexpected values.

* grub-core/bus/usb/usb.c (grub_usb_device_attach): Add missing
grub_print_error.

* grub-core/bus/usb/serial/common.c (grub_usbserial_attach): Fix missing
zero-out of port structure.

* grub-core/fs/xfs.c (grub_xfs_read_block): Fix computation in presence
of extended attributes.

* util/grub-install.in: change misleading comment about
device.map creation

* grub-core/normal/menu_text.c (grub_menu_init_page): Fix behaviour
when menu highlight color isn't set.

Improve FreeDOS direct loading support compatibility.

* include/grub/i386/relocator.h (grub_relocator16_state):
New member ebp.
* grub-core/lib/i386/relocator.c (grub_relocator16_ebp): New extern
variable.
(grub_relocator16_boot): Handle %ebp.
* grub-core/lib/i386/relocator16.S: Likewise.
* grub-core/loader/i386/pc/freedos.c:
Load BPB to pass kernel which partition to load from.
Check that kernel file is not too large.
Set register dl to BIOS unit number as well.

* util/grub-reboot.in (usage): Document the need for
GRUB_DEFAULT=saved.
* util/grub-set-default.in (usage): Likewise.
Reported by: Brian Candler.  Fixes Ubuntu bug #1102925.

* grub-core/lib/libgcrypt_wrap/cipher_wrap.h: Include sys/types.h rather
than defining WORDS_BIGENDIAN manually.

* include/grub/kernel.h (FOR_MODULES): Adjust to preserve alignment
invariants.

* grub-core/font/font.c (blit_comb: do_blit): Make static instead of
nested.
(blit_comb: add_device_width): Likewise.

Remove nested functions from USB iterators.

* include/grub/usb.h (grub_usb_iterate_hook_t): New type.
(grub_usb_controller_iterate_hook_t): Likewise.
(grub_usb_iterate): Add hook_data argument.
(grub_usb_controller_iterate): Likewise.
(struct grub_usb_controller_dev.iterate): Likewise.

Update all implementations and callers.

Improve spkmodem reliability by adding a separator between bytes.

* grub-core/normal/term.c (print_ucs4_terminal): Don't output right
margin when not needed.

Improve spkmomdem reliability by adding a separator between bytes.

Make color variables global instead of it being per-terminal.

* grub-core/commands/ls.c (grub_ls_print_devices): Add missing
asterisk.

Fix powerpc and sparc64 build failures caused by un-nesting memory
map iterators.

* grub-core/disk/arc/arcdisk.c (grub_arcdisk_iterate): Fix
parameter declarations.

* grub-core/commands/lsmmap.c: Fix unused variable on emu.

Improve spkmomdem reliability by adding a separator between bytes.

* grub-core/partmap/msdos.c (embed_signatures): Add the signature of
an Acer registration utility with several sightings in the wild.
Reported by: Rickard Westman.  Fixes Ubuntu bug #987022.

Remove nested functions from filesystem directory iterators.

* include/grub/fs.h (grub_fs_dir_hook_t): New type.
(struct grub_fs.dir): Add hook_data argument.

Update all implementations and callers.

* docs/grub.texi (Multi-boot manual config): Fix typo for
"recommended".

* util/grub-mkimage.c (main): Postpone freeing arguments.output
until after its use in generate_image.

* grub-core/loader/i386/linux.c (grub_cmd_initrd): Don't add the
initrd size to addr_min, since the initrd will be allocated after
this address.

* conf/Makefile.common: Fix autogen rules to pass definition
files on stdin; Makefile.util.am needs Makefile.utilgcry.def

* include/grub/elf.h: Update ARM definitions based on binutils.

Split long USB transfers into short ones.

* docs/grub.texi (Simple configuration): Clarify GRUB_HIDDEN_TIMEOUT
is interrupted by ESC.

* util/grub-script-check.c (main): Uniform the error message.

Remove nested functions from ELF iterators.

Remove nested functions from device iterators.

* include/grub/arc/arc.h (grub_arc_iterate_devs_hook_t): New type.
(grub_arc_iterate_devs): Add hook_data argument.
* include/grub/ata.h (grub_ata_dev_iterate_hook_t): New type.
(struct grub_ata_dev.iterate): Add hook_data argument.
* include/grub/device.h (grub_device_iterate_hook_t): New type.
(grub_device_iterate): Add hook_data argument.
* include/grub/disk.h (grub_disk_dev_iterate_hook_t): New type.
(struct grub_disk_dev.iterate): Add hook_data argument.
(grub_disk_dev_iterate): Likewise.
* include/grub/gpt_partition.h (grub_gpt_partition_map_iterate):
Likewise.
* include/grub/msdos_partition.h (grub_partition_msdos_iterate):
Likewise.
* include/grub/partition.h (grub_partition_iterate_hook_t): New
type.
(struct grub_partition_map.iterate): Add hook_data argument.
(grub_partition_iterate): Likewise.
* include/grub/scsi.h (grub_scsi_dev_iterate_hook_t): New type.
(struct grub_scsi_dev.iterate): Add hook_data argument.

Update all callers.

Fix typos for "developer" and "development".

Add license header to spkmodem-recv.c.

Rewrite spkmodem to use PIT for timing. Double the speed.

Add new command pcidump.

New terminal outputs using serial: morse and spkmodem.

Improve bidi handling in entry editor.

* grub-core/script/lexer.c (grub_script_lexer_init): Rename getline
argument to prevent name collision.

Remove nested functions from script reading and parsing.

* grub-core/kern/parser.c (grub_parser_split_cmdline): Add
getline_data argument, passed to getline.
* grub-core/kern/rescue_parser.c (grub_rescue_parse_line): Add
getline_data argument, passed to grub_parser_split_cmdline.
* grub-core/script/lexer.c (grub_script_lexer_yywrap): Pass
lexerstate->getline_data to lexerstate->getline.
(grub_script_lexer_init): Add getline_data argument, saved in
lexerstate->getline_data.
* grub-core/script/main.c (grub_normal_parse_line): Add getline_data
argument, passed to grub_script_parse.
* grub-core/script/script.c (grub_script_parse): Add getline_data
argument, passed to grub_script_lexer_init.
* include/grub/parser.h (grub_parser_split_cmdline): Update
prototype.  Update all callers to pass appropriate getline data.
(struct grub_parser.parse_line): Likewise.
(grub_rescue_parse_line): Likewise.
* include/grub/reader.h (grub_reader_getline_t): Add void *
argument.
* include/grub/script_sh.h (struct grub_lexer_param): Add
getline_data member.
(grub_script_parse): Update prototype.  Update all callers to pass
appropriate getline data.
(grub_script_lexer_init): Likewise.
(grub_normal_parse_line): Likewise.

* grub-core/commands/legacycfg.c (legacy_file_getline): Add unused
data argument.
* grub-core/kern/parser.c (grub_parser_execute: getline): Make
static instead of nested.  Rename to ...
(grub_parser_execute_getline): ... this.
* grub-core/kern/rescue_reader.c (grub_rescue_read_line): Add unused
data argument.
* grub-core/normal/main.c (read_config_file: getline): Make static
instead of nested.  Rename to ...
(read_config_file_getline): ... this.
(grub_normal_read_line): Add unused data argument.
* grub-core/script/execute.c (grub_script_execute_sourcecode:
getline): Make static instead of nested.  Rename to ...
(grub_script_execute_sourcecode_getline): ... this.
* util/grub-script-check.c (main: get_config_line): Make static
instead of nested.

Remove nested functions from memory map iterators.

* grub-core/efiemu/mm.c (grub_efiemu_mmap_iterate): Add hook_data
argument, passed to hook.
* grub-core/kern/i386/coreboot/mmap.c
(grub_linuxbios_table_iterate): Likewise.
(grub_machine_mmap_iterate: iterate_linuxbios_table): Make static
instead of nested.
(grub_machine_mmap_iterate): Add hook_data argument.
* grub-core/kern/i386/multiboot_mmap.c (grub_machine_mmap_iterate):
Add hook_data argument, passed to hook.
* grub-core/kern/i386/pc/mmap.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/i386/qemu/mmap.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/ieee1275/mmap.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/mips/arc/init.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/mips/loongson/init.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/mips/qemu_mips/init.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/mmap/efi/mmap.c (grub_efi_mmap_iterate): Likewise.
(grub_machine_mmap_iterate): Likewise.
* grub-core/mmap/mmap.c (grub_mmap_iterate): Likewise.
* include/grub/efiemu/efiemu.h (grub_efiemu_mmap_iterate): Update
prototype.
* include/grub/memory.h (grub_memory_hook_t): Add data argument.
Remove NESTED_FUNC_ATTR from here and from all users.
(grub_mmap_iterate): Update prototype.
(grub_efi_mmap_iterate): Update prototype.  Update all callers to
pass appropriate hook data.
(grub_machine_mmap_iterate): Likewise.

* grub-core/commands/acpi.c (grub_acpi_create_ebda: find_hook): Make
static instead of nested.
* grub-core/commands/lsmmap.c (grub_cmd_lsmmap: hook): Likewise.
Rename to ...
(lsmmap_hook): ... this.
* grub-core/efiemu/mm.c (grub_efiemu_mmap_init: bounds_hook):
Likewise.
(grub_efiemu_mmap_fill: fill_hook): Likewise.
* grub-core/kern/i386/coreboot/init.c (grub_machine_init:
heap_init): Likewise.
* grub-core/kern/i386/pc/init.c (grub_machine_init: hook): Likewise.
Rename to ...
(mmap_iterate_hook): ... this.
* grub-core/kern/ieee1275/init.c (grub_claim_heap: heap_init):
Likewise.
* grub-core/lib/ieee1275/relocator.c
(grub_relocator_firmware_get_max_events: count): Likewise.
(grub_relocator_firmware_fill_events: fill): Likewise.  Rename
to ...
(grub_relocator_firmware_fill_events_iter): ... this.
* grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align:
hook): Likewise.  Rename to ...
(grub_relocator_alloc_chunk_align_iter): ... this.
* grub-core/loader/i386/bsd.c (generate_e820_mmap: hook): Likewise.
Rename to ...
(generate_e820_mmap_iter): ... this.
* grub-core/loader/i386/linux.c (find_mmap_size: hook): Likewise.
Rename to ...
(count_hook): ... this.
(grub_linux_boot: hook): Likewise.  Rename to ...
(grub_linux_boot_mmap_find): ... this.
(grub_linux_boot: hook_fill): Likewise.  Rename to ...
(grub_linux_boot_mmap_fill): ... this.
* grub-core/loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap:
hook): Likewise.  Rename to ...
(grub_fill_multiboot_mmap_iter): ... this.
* grub-core/loader/multiboot.c (grub_get_multiboot_mmap_count:
hook): Likewise.  Rename to ...
(count_hook): ... this.
* grub-core/loader/multiboot_mbi2.c (grub_fill_multiboot_mmap:
hook): Likewise.  Rename to ...
(grub_fill_multiboot_mmap_iter): ... this.
* grub-core/loader/powerpc/ieee1275/linux.c
(grub_linux_claimmap_iterate: alloc_mem): Likewise.
* grub-core/loader/sparc64/ieee1275/linux.c (alloc_phys: choose):
Likewise.  Rename to ...
(alloc_phys_choose): ... this.
(determine_phys_base: get_physbase): Likewise.
* grub-core/mmap/i386/mmap.c (grub_mmap_malign_and_register:
find_hook): Likewise.
* grub-core/mmap/i386/pc/mmap.c (preboot: fill_hook): Likewise.
(malloc_hook: count_hook): Likewise.
* grub-core/mmap/i386/uppermem.c (grub_mmap_get_lower: hook):
Likewise.  Rename to ...
(lower_hook): ... this.
(grub_mmap_get_upper: hook): Likewise.  Rename to ...
(upper_hook): ... this.
(grub_mmap_get_post64: hook): Likewise.  Rename to ...
(post64_hook): ... this.
* grub-core/mmap/mips/uppermem.c (grub_mmap_get_lower: hook):
Likewise.  Rename to ...
(lower_hook): ... this.
(grub_mmap_get_upper: hook): Likewise.  Rename to ...
(upper_hook): ... this.
* grub-core/mmap/mmap.c (grub_mmap_iterate: count_hook): Likewise.
(grub_mmap_iterate: fill_hook): Likewise.
(fill_mask): Pass addr and mask within a single struct.
(grub_cmd_badram: hook): Make static instead of nested.  Rename
to ...
(badram_iter): ... this.
(grub_cmd_cutmem: hook): Likewise.  Rename to ...
(cutmem_iter): ... this.