Vladimir 'phcoder' Serbinenko
7ba7efc371
Merge gingold3 into ia64
2010-09-01 10:15:56 +02:00
Tristan Gingold
41a331a8d3
* grub-core/commands/efi/lsefimmap.c: New file.
...
* grub-core/Makefile.core.def (lsefimmap): New module.
* include/grub/efi/api.h (PRIxGRUB_EFI_UINTN_T): New definition.
Also-By: Robert Millan <rmh.grub@aybabtu.com>
Also-By: Vladimir Serbinenko <phcoder@gmail.com>
2010-09-01 10:12:41 +02:00
Vladimir 'phcoder' Serbinenko
07329a9ac9
Fix some compilation problems
2010-09-01 09:44:32 +02:00
Vladimir 'phcoder' Serbinenko
c84a9b54ad
remove allocate_boot_pages and free_boot_pages. They are pointless now
2010-09-01 09:43:36 +02:00
Vladimir 'phcoder' Serbinenko
b32185d1bd
Merge gingold2 into ia64
2010-09-01 02:39:11 +02:00
Tristan Gingold
105de6a758
* grub-core/commands/efi/lsefisystab.c: New file.
...
* grub-core/commands/efi/lssal.c: Likewise.
* grub-core/Makefile.core.def (lsacpi): New module.
(lsefisystab): Likewise.
* include/grub/efi/api.h (GRUB_EFI_SAL_TABLE_GUID): New definition.
(GRUB_EFI_HCDP_TABLE_GUID): Likewise.
(grub_efi_sal_system_table): New struct.
(grub_efi_sal_system_table_entrypoint_descriptor): Likewise.
(grub_efi_sal_system_table_memory_descriptor): Likewise.
(grub_efi_sal_system_table_platform_features): Likewise.
(grub_efi_sal_system_table_translation_register_descriptor): Likewise.
(grub_efi_sal_system_table_purge_translation_coherence): Likewise.
(grub_efi_sal_system_table_ap_wakeup): Likewise.
* include/grub/types.h (PRIuGRUB_UINT64_T): New definition.
Also-By: Robert Millan <rmh.grub@aybabtu.com>
Also-By: Vladimir Serbinenko <phcoder@gmail.com>
2010-09-01 02:37:17 +02:00
Vladimir 'phcoder' Serbinenko
5327104af5
merge gingold1_lsacpi into ia64
2010-09-01 01:13:53 +02:00
Tristan Gingold
1782b135e5
* commands/lsacpi.c: New file.
...
* grub-core/Makefile.core.def (lsacpi): New module.
* include/grub/acpi.h (GRUB_ACPI_FADT_SIGNATURE): New definition.
(GRUB_ACPI_MADT_SIGNATURE): Likewise.
(grub_acpi_madt_entry_header): New struct.
(grub_acpi_madt): Likewise.
(grub_acpi_madt_entry_interrupt_override): Likewise.
(grub_acpi_madt_entry_sapic): Likewise.
(grub_acpi_madt_entry_lsapic): Likewise.
(grub_acpi_madt_entry_platform_int_source): Likewise.
* include/grub/types.h (PRIxGRUB_UINT32_T): New definition.
(PRIuGRUB_UINT32_T): Likewise.
(PRIxGRUB_UINT64_T): Likewise.
Also-By: Robert Millan <rmh.grub@aybabtu.com>
Also-By: Vladimir Serbinenko <phcoder@gmail.com>
2010-09-01 01:05:32 +02:00
Vladimir 'phcoder' Serbinenko
6585de4c0c
merge mainline into ia64
2010-08-31 21:47:26 +02:00
Vladimir 'phcoder' Serbinenko
70770806f3
Merge mainline into keylayouts
2010-08-31 14:12:34 +02:00
Vladimir 'phcoder' Serbinenko
5aaf2c18bd
Merge mainline into keylayouts
2010-08-31 14:03:29 +02:00
Vladimir 'phcoder' Serbinenko
21ed554bb0
Interrupt wrapping and code simplifications.
...
* Makefile.util.def (grub-mkrescue): Use x86 tg instead of
x86_noieee1275 which are functionaly equivalent in this case.
(grub-install): Make source on each platform explicit. Enable on
all noemu.
* gentpl.py (x86_efi_pc): Removed group.
(x86_noefi): Likewise.
(i386_noefi): Likewise.
(x86_noieee1275): Likewise.
(i386_noieee1275): Likewise.
(i386_noefi_noieee1275): Likewise.
(i386_pc_qemu_coreboot): Likewise.
(i386_coreboot_multiboot): Likewise.
(i386_pc_coreboot_multiboot_qemu): Likewise.
(x86_noefi_mips): Likewise.
(noieee1275): Likewise.
(ieee1275_mips): Likewise.
(noemu_noieee1275): Likewise.
(cmos): New group.
(usb): Likewise.
(videoinkernel): Likewise.
(videomodules): Likewise.
* grub-core/Makefile.am (KERNEL_HEADER_FILES): Remove
include/grub/elf.h, include/grub/elfload.h, include/grub/net.h,
include/grub/reader.h, include/grub/symbol.h, include/grub/types.h,
include/grub/loader.h, include/grub/msdos_partition.h,
include/grub/machine/biosdisk.h, include/grub/machine/boot.h,
include/grub/machine/console.h, include/grub/machine/vga.h,
include/grub/machine/vbe.h, include/grub/machine/init.h,
include/grub/machine/kernel.h, include/grub/cpu/time.h,
include/grub/cpu/types.h, include/grub/gzio.h and include/grub/menu.h
(KERNEL_HEADER_FILES) [i386-pc]: Add include/grub/machine/int.h.
(KERNEL_HEADER_FILES) [i386-ieee1275]: Add include/grub/i386/pit.h
* grub-core/Makefile.core.def (kernel): Explicit the source for
startup. Explicit the platforms using kern/generic/rtc_get_time_ms.c.
Split ieee1275_mips. Remove kern/i386/halt.c. Remove kern/i386/misc.S.
Enable kern/i386/pit.c on all x86. Remove kern/i386/ieee1275/init.c.
Use videoinkernel tag.
(usb): Enable on all usb.
(usbserial_common): Likewise.
(usbserial_pl2303): Likewise.
(usbserial_ftdi): Likewise.
(uhci): Enable on all x86.
(ohci): Enable on all pci.
(cmostest): Enable on all CMOS.
(acpi): Include commands/acpi.c on all platforms.
(halt): Add relevant lib/*/halt.c.
(hdparm): Enable on all pci.
(lspci): Likewise.
(usbtest): Enable on all usb.
(ata): Enable on all pci.
(ata_pthru): Likewise.
(usbms): Enable on all usb.
(usb_keyboard): Likewise.
(font): Use tag videomodules.
(bufio): Likewise.
(datetime): Use tag cmos. Enable on all noemu.
(mmap): Use tags common and x86.
(gfxterm): Use tag videomodules.
(bitmap): Likewise.
(bitmap_scale): Likewise.
(video_fb): Likewise.
(video): Likewise.
* grub-core/bus/usb/ohci.c (grub_ohci_td): Make link_td a pointer and
adjust padding accordingly. All users updated.
(grub_ohci_transaction): Fix bad format specification.
(GRUB_MOD_INIT): Add asserts for struct size.
* grub-core/bus/usb/uhci.c (grub_uhci_pci_iter): Add explicit casts.
(grub_alloc_td): Likewise.
(grub_free_queue): Likewise.
(grub_uhci_transfer): Likewise.
(grub_uhci_transaction): Fix bad format specification.
* grub-core/bus/usb/usbtrans.c (grub_usb_control_msg): Likewise.
(grub_usb_bulk_readwrite): Likewise.
* grub-core/kern/i386/misc.S (grub_stop): Moved from here ...
* grub-core/commands/i386/pc/halt.c (stop): ...here. Transformed into C.
Made static.
* grub-core/lib/i386/halt.c (stop): ... and here. Transformed into C.
Made static.
* grub-core/kern/i386/pc/startup.S (grub_halt): Moved from here ...
* grub-core/commands/i386/pc/halt.c (grub_halt): ...here.
Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_biosdisk_rw_int13_extensions):
Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_rw_int13_extensions):
... here. Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_biosdisk_rw_standard):
Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_rw_standard):
... here. Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S
(grub_biosdisk_check_int13_extensions): Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c
(grub_biosdisk_check_int13_extensions): ... here. Transformed into C.
Made static.
* grub-core/kern/i386/pc/startup.S
(grub_biosdisk_get_cdinfo_int13_extensions): Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c
(grub_biosdisk_get_cdinfo_int13_extensions): ... here.
Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S
(grub_biosdisk_get_diskinfo_int13_extensions): Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c
(grub_biosdisk_get_diskinfo_int13_extensions): ... here.
Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S
(grub_biosdisk_get_diskinfo_standard): Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c
(grub_biosdisk_get_diskinfo_standard): ... here.
Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S
(grub_biosdisk_get_num_floppies): Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c
(grub_biosdisk_get_num_floppies): ... here.
Transformed into C. Made static.
* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_get_diskinfo_real):
New function.
* grub-core/kern/i386/pc/startup.S (grub_pxe_scan): Moved from here ...
* grub-core/fs/i386/pc/pxe.c (grub_pxe_scan): ... here.
Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_rm_entry): Moved from here ...
* grub-core/fs/i386/pc/pxe.c (grub_rm_entry): ... here.
Transformed into C. Made static.
* grub-core/kern/i386/ieee1275/init.c: Removed.
* grub-core/kern/i386/misc.S: Likewise.
* grub-core/kern/i386/pc/startup.S (grub_get_memsize):
Splitted from here ...
* grub-core/kern/i386/pc/init.c (grub_get_conv_memsize): ... here.
Transformed into C. Made static. All users updated.
* grub-core/kern/i386/pc/mmap.c (grub_get_ext_memsize): ... and here.
Transformed into C. Made static. All users updated.
* grub-core/kern/i386/pc/startup.S (grub_get_eisa_mmap):
Moved from here...
* grub-core/kern/i386/pc/mmap.c (grub_get_eisa_mmap): ... here.
Transformed into C. Made static. All users updated.
* grub-core/kern/i386/pc/startup.S (grub_get_mmap_entry):
Moved from here...
* grub-core/kern/i386/pc/mmap.c (grub_get_mmap_entry): ... here.
Transformed into C. Made static. All users updated.
* grub-core/kern/i386/pc/startup.S (grub_stop_floppy):
Removed (replaced by C version).
* grub-core/kern/i386/pc/startup.S (grub_vga_set_mode):
Moved from here...
* grub-core/video/i386/pc/vga.c (grub_vga_set_mode): ...here.
Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_controller_info):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_controller_info):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_mode_info):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_mode_info):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_mode):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_mode):
... here. Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_mode):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_mode):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S
(grub_vbe_bios_getset_dac_palette_width):Moved from here...
* grub-core/video/i386/pc/vbe.c
(grub_vbe_bios_getset_dac_palette_width):... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_memory_window):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_memory_window):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_memory_window):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_memory_window):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_scanline_length):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_scanline_length):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_scanline_length):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_scanline_length):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_display_start):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_display_start):
... here. Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_display_start):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_display_start):
... here. Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_palette_data):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_palette_data):
... here. Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_pxe_call): Receive
pxe_rm_entry as third argument.
(grub_bios_interrupt): New function.
* grub-core/kern/i386/qemu/mmap.c: Remove useless include.
* grub-core/kern/i386/qemu/startup.S (codestart): Do cli;hlt instead
of calling grub_stop.
* grub-core/kern/efi/efi.c (grub_halt): Moved from here ...
* grub-core/lib/efi/halt.c (grub_halt): ...here.
* grub-core/kern/emu/main.c (grub_halt): Moved from here ...
* grub-core/lib/emu/halt.c (grub_halt): ... here.
* grub-core/lib/i386/halt.c: Moved from here ...
* grub-core/lib/i386/halt.c: ... here.
* grub-core/kern/ieee1275/openfw.c (grub_halt): Moved from here ...
* grub-core/lib/ieee1275/halt.c (grub_halt): ... here.
* grub-core/loader/i386/pc/linux.c (grub_linux16_boot): Call
grub_stop_floppy.
* grub-core/loader/i386/xnu.c (guessfsb) [IEEE1275]: Enable.
* include/grub/i386/coreboot/init.h: Removed.
* include/grub/i386/multiboot/init.h: Likewise.
* include/grub/i386/pc/biosdisk.h: Removed all function prototypes.
* include/grub/i386/pc/init.h: Likewise except grub_gate_a20.
* include/grub/i386/pc/int.h: New file.
* include/grub/i386/pc/pxe.h (GRUB_PXE_SIGNATURE): New definition.
(grub_pxe_scan): Removed.
(grub_pxe_call): Update prototype.
* include/grub/i386/pc/vbe.h: Removed EXPORT_FUNC and useless
prototypes.
* include/grub/i386/pc/vga.h (grub_vga_set_mode): Removed.
* include/grub/i386/qemu/init.h: Removed.
* include/grub/mips/yeeloong/kernel.h (grub_reboot): Add missing
noreturn.
(grub_halt): Likewise.
* include/grub/misc.h (grub_halt): Removed EXPORT_FUNC.
(grub_reboot): Likewise.
* grub-core/kern/i386/coreboot/init.c (grub_stop_floppy): Moved from here...
* include/grub/i386/floppy.h (grub_stop_floppy): ...here. Inlined.
* grub-core/kern/i386/pc/startup.S (grub_hard_stop): Removed.
2010-08-30 22:02:58 +02:00
Vladimir 'phcoder' Serbinenko
11721d1926
Remove leftover embedding of font objects.
...
* include/grub/kernel.h (OBJ_TYPE_FONT): Removed.
* util/grub-install.in (font): Removed.
* util/grub-mkimage.c (generate_image): Remove font support. All users
updated.
2010-08-30 20:23:04 +02:00
Vladimir 'phcoder' Serbinenko
0f40441b91
Remove useless prototypes
2010-08-30 16:26:05 +02:00
Vladimir 'phcoder' Serbinenko
b0ea3a5a93
Add missing noreturn
2010-08-30 16:25:39 +02:00
Vladimir 'phcoder' Serbinenko
069c9c5fda
merge mainline into intwrap
2010-08-29 23:21:21 +02:00
Vladimir 'phcoder' Serbinenko
6d387bafaf
Fix compilation on yeeloong
2010-08-29 13:45:36 +02:00
Vladimir 'phcoder' Serbinenko
f0b05761f4
fix multiboot compilation
2010-08-29 00:46:36 +02:00
Vladimir 'phcoder' Serbinenko
328951ac24
Add safety checks in relocator and add a GRUB_MM_CHECK macro
2010-08-28 21:27:10 +02:00
Vladimir 'phcoder' Serbinenko
4fc95be2e7
fix grub-emu compilation
2010-08-28 14:52:25 +02:00
Vladimir 'phcoder' Serbinenko
fff175c77f
Implement grub-menulst2cfg and fix many bugs in legacy_parser
2010-08-27 20:04:49 +02:00
BVK Chaitanya
8fdefb9253
merge with mainline
2010-08-26 12:11:57 +05:30
BVK Chaitanya
b899201c69
merge with mainline
2010-08-26 11:45:29 +05:30
BVK Chaitanya
47b4c2c3e8
pull-in block-arg branch
2010-08-26 11:32:35 +05:30
BVK Chaitanya
928bad4708
merge with mainline
2010-08-26 09:30:11 +05:30
Vladimir 'phcoder' Serbinenko
ecde61b490
openbsd ramdisk support
2010-08-26 02:46:30 +02:00
Vladimir 'phcoder' Serbinenko
afba9f98ec
MErge mainline into intwrap
2010-08-25 23:39:42 +02:00
Vladimir 'phcoder' Serbinenko
89e07694dc
Remove grub_dl_unload_all. It's unnecessary and causes trouble
2010-08-25 21:19:45 +02:00
BVK Chaitanya
aa5cd41af5
return command for functions
2010-08-25 19:35:52 +05:30
BVK Chaitanya
a9b85993ee
merge with mainline
2010-08-25 14:45:56 +05:30
Vladimir 'phcoder' Serbinenko
16bd6cfab2
Merge mainline into newreloc. For now without boot tests
2010-08-25 03:25:18 +02:00
Vladimir 'phcoder' Serbinenko
a98f88ecfe
Add pot powered flag declaration
2010-08-23 23:28:33 +02:00
Vladimir 'phcoder' Serbinenko
f0b02c9c86
Handle ACKs, NACKs and restore state on booting
2010-08-23 20:43:44 +02:00
Vladimir 'phcoder' Serbinenko
3ba3c4567e
Change GRUB_TERM_NO_KEY to 0
2010-08-23 13:21:53 +02:00
Vladimir 'phcoder' Serbinenko
9518e2a12b
Macroify GRUB_TERM_NO_KEY and use grub_checkkey in grub_getkey
2010-08-23 12:53:42 +02:00
Vladimir 'phcoder' Serbinenko
df2174dded
Remove checkkey on term level
2010-08-23 12:07:49 +02:00
Vladimir 'phcoder' Serbinenko
7ae3eb6232
Wait for ACKs when setting the mode
2010-08-23 11:26:28 +02:00
Vladimir 'phcoder' Serbinenko
09206dc3d0
Macroify key constants
2010-08-22 23:56:41 +02:00
Vladimir 'phcoder' Serbinenko
5ea70ca5fa
Support scancode set 2
2010-08-22 22:53:31 +02:00
Vladimir 'phcoder' Serbinenko
efc3e75f4d
Bump keylayouts version
2010-08-22 18:16:16 +02:00
BVK Chaitanya
d84666e6bb
merge with mainline
2010-08-22 21:00:22 +05:30
Vladimir 'phcoder' Serbinenko
c32f26bce8
Make USB the main keylayout for simplicity
2010-08-22 16:06:09 +02:00
Vladimir 'phcoder' Serbinenko
96157c5378
Increase pre-repeat usb keyboad interval
2010-08-22 01:01:31 +02:00
Vladimir 'phcoder' Serbinenko
7e6975d7ea
Support USB key repeat
2010-08-22 00:29:34 +02:00
Vladimir 'phcoder' Serbinenko
524c2712ad
merge usb into keylayouts
2010-08-21 23:17:44 +02:00
Vladimir 'phcoder' Serbinenko
ff62c48f5a
Use status change pipe for hub hotplug detection
2010-08-21 23:09:37 +02:00
Vladimir 'phcoder' Serbinenko
f609c84a7f
MAke an enum out of reqtype
2010-08-21 21:55:24 +02:00
Vladimir 'phcoder' Serbinenko
e959937cfd
Use background transfers for usb_keyboard
2010-08-21 17:12:51 +02:00
Vladimir 'phcoder' Serbinenko
3ee4474e8d
Prepare infrastructure for background USB transfers
2010-08-21 16:09:43 +02:00
Vladimir 'phcoder' Serbinenko
df26241939
* include/grub/usb.h (grub_usb_device): Add 'data' field back. It's
...
needed by libusb wrapper.
2010-08-21 02:09:16 +02:00
Vladimir 'phcoder' Serbinenko
fea90138d5
merge mainline into keylayouts
2010-08-20 22:13:19 +02:00
Vladimir 'phcoder' Serbinenko
d6f66ca2a0
Export serial-related functions from kernel
2010-08-20 21:31:33 +02:00
Vladimir 'phcoder' Serbinenko
8161b08687
Merge mainline into usb
2010-08-20 20:12:26 +02:00
Vladimir 'phcoder' Serbinenko
52d8255d20
Support hot unplugging
2010-08-20 19:34:29 +02:00
Vladimir 'phcoder' Serbinenko
9ba74de61a
Scan descriptor rather than elying on hardcoded endpoint number
2010-08-20 16:34:34 +02:00
Vladimir 'phcoder' Serbinenko
5ef4e08416
add usb keymap support
2010-08-19 15:32:43 +02:00
Vladimir 'phcoder' Serbinenko
e55e09628d
Hook AT keyboard mapping
2010-08-19 15:00:31 +02:00
Vladimir 'phcoder' Serbinenko
ed19677fe3
Revert all parts done for BIOS keymap translation
2010-08-19 13:32:36 +02:00
BVK Chaitanya
16c7cb32c8
merge with mainline
2010-08-19 16:54:00 +05:30
Vladimir 'phcoder' Serbinenko
eb628338db
AltGr support
2010-08-19 11:44:49 +02:00
Vladimir 'phcoder' Serbinenko
7ea82054f5
Solve keypad-related issues
2010-08-19 04:13:32 +02:00
Vladimir 'phcoder' Serbinenko
2111447675
Add new flag SHIFT
2010-08-19 02:21:36 +02:00
Carles Pina i Estany
b6f7b4ba03
Reimported heavily modified version of cpina's grub-mklayout
2010-08-19 02:15:29 +02:00
Vladimir 'phcoder' Serbinenko
7a6459e12d
support for Fn keys
2010-08-19 01:07:50 +02:00
Vladimir 'phcoder' Serbinenko
2cccf4b0c4
Merge mainline into keylayouts
2010-08-18 22:28:47 +02:00
BVK Chaitanya
6304d29255
working copy, wo nested packaging
2010-08-17 19:03:22 +05:30
BVK Chaitanya
a8876fc7ca
merge with setparams branch
2010-08-15 12:11:07 +05:30
BVK Chaitanya
3a20130e7a
setparams command to set positional parameters
2010-08-15 12:02:33 +05:30
BVK Chaitanya
1379af7834
merge with mainline
2010-08-15 11:12:53 +05:30
Paulo de Rezende Pinatti
10830203a0
Added ARP protocol to network stack and fixed bug in grub_netbuff_alloc function.
...
* include/grub/net/arp.h: added arp header, arp cache entry and related constants and functions
* net/arp.c: added functions arp_init_table, arp_find_entry, arp_resolve and arp_receive
* net/ethernet.c (send_ethernet_packet): replaced hardcoded hardware address by parameter target_addr
* net/ethernet.c (recv_ethernet_packet): added call to arp_receive when packet is of type 0x803 (ARP) and only return when packet is of type determined by parameter ethertype
* net/ip.c (send_ip_packet): added call to arp_resolve to determine hardware address of destination
* net/netbuff.c (grub_netbuff_alloc): fixed swapped parameters in call to grub_memalign
2010-08-13 14:42:16 -03:00
BVK Chaitanya
681440aa5b
fix bad color name handling
2010-08-12 20:45:55 +05:30
BVK Chaitanya
00a8a3eee3
merge with mainline
2010-08-12 14:43:34 +05:30
BVK Chaitanya
c6a343c3c6
merge with mainline
2010-08-12 13:23:13 +05:30
BVK Chaitanya
163dd4f7e9
merge with mainline
2010-08-12 12:02:48 +05:30
BVK Chaitanya
fd324286d4
merge with mainline
2010-08-12 09:30:26 +05:30
BVK Chaitanya
4962a2032f
merge with mainline
2010-08-12 09:16:24 +05:30
BVK Chaitanya
0bcbae0fa7
merge with mainline
2010-08-12 09:01:59 +05:30
Vladimir 'phcoder' Serbinenko
f947ab49b0
Remove the dump of sm712 initialisation sequence.
...
* include/grub/pci.h (GRUB_PCI_CLASS_SUBCLASS_VGA): New const.
* include/grub/vga.h (GRUB_VGA_IO_ARX_READ): New register.
(GRUB_VGA_IO_MISC_WRITE): Likewise.
(GRUB_VGA_CR_*): Added many registers.
(GRUB_VGA_SR_*): Likewise.
(GRUB_VGA_GR_*): Likewise.
(grub_vga_write_arx): New function.
(grub_video_hw_config): New struct.
(grub_vga_set_geometry): New function.
* kern/i386/qemu/init.c (load_palette): Use grub_vga_write_arx and
GRUB_PCI_CLASS_SUBCLASS_VGA.
* video/cirrus.c (grub_video_cirrus_setup): Use grub_vga_set_geometry.
* video/sm712.c (grub_sm712_write_reg): New function
(grub_sm712_read_reg): Likewise.
(grub_sm712_sr_write): Likewise.
(grub_sm712_gr_write): Likewise.
(grub_sm712_cr_write): Likewise.
(grub_sm712_write_arx): Likewise.
(grub_sm712_cr_shadow_write): Likewise.
(grub_sm712_write_dda_lookup): Likewise.
(grub_video_sm712_setup): Initialise the video rather then
blindly replay the dump.
(main) [TEST]: Add a routine to be able to compile as standalone for
tests.
* video/sm712_init.c (sm712_init): Removed.
(sm712_sr_seq1): New array.
(sm712_sr_seq2): Likewise.
2010-08-11 04:18:07 +02:00
Vladimir 'phcoder' Serbinenko
f0206638bf
* include/grub/vga.h: Add missing grub/pci.h include.
2010-08-11 04:00:06 +02:00
Vladimir 'phcoder' Serbinenko
cf0c775ed4
* include/grub/vga.h (grub_vga_gr_write): Add GRUB_MACHINE_PCI_IO_BASE.
...
(grub_vga_gr_read): Likewise.
(grub_vga_cr_write): Likewise.
(grub_vga_cr_read): Likewise.
(grub_vga_sr_write): Likewise.
(grub_vga_sr_read): Likewise.
(grub_vga_palette_read): Likewise.
(grub_vga_palette_write): Likewise.
* video/sm712.c (GRUB_SM712_REG_BASE): New definition.
(grub_sm712_sr_read): New function.
(grub_video_sm712_setup): Use grub_vga_sr_write and grub_sm712_sr_read.
* video/sm712_init.c (sm712_init): Substract GRUB_MACHINE_PCI_IO_BASE.
2010-08-10 13:43:43 +02:00
BVK Chaitanya
368ba29261
merge with mainline
2010-08-10 09:52:16 +05:30
BVK Chaitanya
13a3852091
merge with mainline
2010-08-10 09:12:39 +05:30
BVK Chaitanya
67a9e4d95d
review fixes and a testcase
2010-08-09 21:42:24 +05:30
BVK Chaitanya
dc4ca99e2e
merge with mainline
2010-08-04 19:22:40 +05:30
Robert Millan
0de22aa997
2010-08-04 Robert Millan <rmh@gnu.org>
...
* include/grub/emu/misc.h (grub_find_mount_point_from_dir)
(grub_find_zpool_from_mount_point): Merge into ...
(grub_find_zpool_from_dir): ... this.
* kern/emu/misc.c: Likewise.
* kern/emu/misc.c
(grub_make_system_path_relative_to_its_root): Replace
grub_find_mount_point_from_dir() / grub_find_zpool_from_mount_point()
with grub_find_zpool_from_dir().
* kern/emu/getroot.c (find_root_device_from_libzfs): Likewise.
2010-08-04 13:29:13 +02:00
Robert Millan
9dd6fd50b4
2010-08-03 Robert Millan <rmh@gnu.org>
...
Fix grub-emu build.
* include/grub/util/misc.h: Move `<grub/util/libzfs.h>' to ...
* include/grub/emu/misc.h: ... here.
* include/grub/util/misc.h (grub_get_libzfs_handle): Move function ...
* include/grub/emu/misc.h (grub_get_libzfs_handle): ... here.
* util/misc.c: Remove `<grub/util/libzfs.h>'.
[HAVE_LIBZFS] (libzfs_handle, fini_libzfs)
(grub_get_libzfs_handle): Move to ...
* kern/emu/misc.c [HAVE_LIBZFS] (__libzfs_handle, fini_libzfs)
(grub_get_libzfs_handle): ... here.
2010-08-03 23:51:48 +02:00
Robert Millan
f7abdefbdd
2010-08-01 Robert Millan <rmh@gnu.org>
...
Make it even harder to use uninitialized `libzfs_handle' (and
make the interface a bit simpler).
* include/grub/util/misc.h (grub_util_init_libzfs)
(libzfs_handle): Remove.
(grub_get_libzfs_handle): New prototype.
* util/misc.c [HAVE_LIBZFS] (libzfs_handle): Add `static'
attribute.
(grub_util_init_libzfs): Remove.
(grub_get_libzfs_handle): New function.
* kern/emu/getroot.c (find_root_device_from_libzfs): Use
grub_get_libzfs_handle() to obtain a libzfs handle instead of
accessing `libzfs_handle' directly.
2010-08-01 23:12:24 +02:00
Vladimir 'phcoder' Serbinenko
443a6c4b21
Skip unexpected descriptors
2010-08-01 23:08:03 +02:00
Robert Millan
c882acc031
2010-08-01 Robert Millan <rmh@gnu.org>
...
* include/grub/emu/misc.h (grub_find_mount_point_from_dir)
(grub_find_zpool_from_mount_point): New function prototypes.
* kern/emu/getroot.c [HAVE_GETFSSTAT]: Move `<sys/mount.h>' to ...
* kern/emu/misc.c [HAVE_GETFSSTAT]: ... here.
* kern/emu/getroot.c (find_mount_point_from_dir): Move to ...
* kern/emu/misc.c (grub_find_mount_point_from_dir): ... this. Remove
`static' attribute.
* kern/emu/getroot.c (find_root_device_from_libzfs): Split code for
finding zpool from mount point into ...
* kern/emu/misc.c (grub_find_zpool_from_mount_point): ... this.
* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): When
requested path is part of a ZFS pool, use
grub_find_zpool_from_mount_point() to detect its filesystem name,
and generate a path with `/fsname@path' syntax.
2010-08-01 22:59:02 +02:00
Colin Watson
8bfe31d82b
* include/grub/util/libzfs.h (libzfs_init): Set argument list to
...
(void) rather than () so that this is a proper prototype.
2010-08-01 16:41:46 -05:00
Vladimir 'phcoder' Serbinenko
fafc23e90a
merge mainline into usb
2010-08-01 21:23:18 +02:00
Robert Millan
3169f4c76a
2010-07-31 Robert Millan <rmh@gnu.org>
...
* configure.ac: Check for `libzfs.h' and `libnvpair.h'.
* include/grub/util/libnvpair.h: Include `<config.h>'.
[HAVE_LIBNVPAIR_H]: Include `<libnvpair.h>' instead of
declaring libnvpair prototypes ourselves.
* include/grub/util/libzfs.h: Include `<config.h>'.
[HAVE_LIBZFS_H]: Include `<libzfs.h>' instead of
declaring libzfs prototypes ourselves.
(libzfs_handle): Moved to ...
* include/grub/util/misc.h (libzfs_handle): ... here.
Include `<grub/util/libzfs.h>'.
2010-07-31 12:22:01 +02:00
Robert Millan
c9a00aeeaa
2010-07-30 Robert Millan <rmh@gnu.org>
...
* include/grub/emu/misc.h: Add missing license header.
2010-07-30 22:01:10 +02:00
Robert Millan
a184f9c801
2010-07-30 Robert Millan <rmh@gnu.org>
...
Enable `grub-probe -t device' resolution on ZFS.
* configure.ac: Check for getfsstat(), libzfs and libnvpair.
* include/grub/util/libnvpair.h: New file.
* include/grub/util/libzfs.h: New file.
* kern/emu/getroot.c: Include `<assert.h>' and `<error.h>'.
[HAVE_LIBZFS && HAVE_LIBNVPAIR]: Include `<grub/util/libzfs.h>' and
`<grub/util/libnvpair.h>'.
[HAVE_GETFSSTAT]: Include `<sys/mount.h>'.
(find_mount_point_from_dir): New static function.
[HAVE_LIBZFS && HAVE_LIBNVPAIR] (find_root_device_from_libzfs): New
function.
[HAVE_LIBZFS && HAVE_LIBNVPAIR] (grub_guess_root_device): Use
find_root_device_from_libzfs() before ressorting to find_root_device().
* include/grub/util/misc.h (grub_util_init_libzfs): New function
prototype.
* util/misc.c: Include `<grub/util/libzfs.h>'.
(grub_util_init_libzfs): New function.
[HAVE_LIBZFS] (libzfs_handle): New global variable.
[HAVE_LIBZFS] (fini_libzfs): New static function.
(grub_util_init_libzfs): New function.
* util/grub-probe.c (main): Call grub_util_init_libzfs().
2010-07-30 21:43:12 +02:00
Robert Millan
f7790cdd5d
2010-07-30 Robert Millan <rmh@gnu.org>
...
* include/grub/emu/misc.h (grub_make_system_path_relative_to_its_root)
(xmalloc, xrealloc, xstrdup, xasprintf): Add
`warn_unused_result' attribute.
* include/grub/misc.h (grub_strdup, grub_strndup, grub_strlen)
(grub_xasprintf, grub_xvasprintf): Likewise.
* include/grub/emu/misc.h (xasprintf): Remove duplicate prototype.
2010-07-30 11:27:02 +02:00
Manoel R. Abranches
7c978f0690
Implement the size field.
2010-07-29 18:17:01 -03:00
BVK Chaitanya
9e3e24e47f
cleanup
2010-07-29 22:52:09 +05:30
BVK Chaitanya
8c184ffa19
cleanup
2010-07-29 21:09:18 +05:30
BVK Chaitanya
fa7edceefb
pull-in func-params branch
2010-07-23 03:32:12 +05:30
BVK Chaitanya
54416e9d71
merge with mainline
2010-07-23 02:44:22 +05:30
BVK Chaitanya
d737bdc136
merge with mainline
2010-07-22 23:16:22 +05:30
BVK Chaitanya
a281e2e80a
merge with mainline
2010-07-22 22:39:42 +05:30
BVK Chaitanya
82e323a3d7
merge with mainline
2010-07-22 22:39:20 +05:30
BVK Chaitanya
1767f7096c
menuentry can pass parameters to its definition
2010-07-22 21:15:14 +05:30
BVK Chaitanya
639cc5ab44
menuentry option parsing is done using lib/arg.c
2010-07-22 19:01:40 +05:30
BVK Chaitanya
8527be0c5d
pull-in block-arg again
2010-07-22 05:34:38 +05:30
BVK Chaitanya
0878653f65
pull-in nested-record branch
2010-07-22 05:03:49 +05:30
BVK Chaitanya
3a082b7f2a
memory management for block parameters
2010-07-22 04:49:05 +05:30
BVK Chaitanya
2bcfd8a295
pull-in block-arg again
2010-07-21 03:50:23 +05:30
BVK Chaitanya
9ebedc24f2
restrict to only one block-arg (as last) param per command
2010-07-21 03:47:30 +05:30
Colin Watson
31cfe714f2
* disk/mdraid_linux.c: Update copyright years.
...
* disk/raid.c: Likewise.
* include/grub/raid.h: Likewise.
* kern/emu/getroot.c: Likewise.
2010-07-20 11:10:49 +01:00
Vladimir 'phcoder' Serbinenko
7e8b77c033
AHCI skeleton
2010-07-19 21:22:54 +02:00
Vladimir 'phcoder' Serbinenko
34787305df
Allow psartial transfers and use them for usbserial
2010-07-19 08:43:01 +02:00
Vladimir 'phcoder' Serbinenko
824e1447ac
Use generic description of HID endpoints
2010-07-19 00:13:06 +02:00
Vladimir 'phcoder' Serbinenko
ac2534273b
fix losing pl2303 input at the price of losing some input bytes sometimes.
2010-07-19 00:12:59 +02:00
Vladimir 'phcoder' Serbinenko
9685412782
PL2303 works and is configurable. But sometime input is lost
2010-07-18 23:12:08 +02:00
Vladimir 'phcoder' Serbinenko
d556277751
Add possibility of bulk reading with short timeout
2010-07-18 21:35:22 +02:00
BVK Chaitanya
ec4689e82f
pull-in block-arg branch
2010-07-19 00:53:18 +05:30
Colin Watson
1c785436da
* disk/dmraid_nvidia.c (grub_dmraid_nv_detect): Add start_sector
...
parameter. Set its pointer target to 0.
* disk/mdraid_linux.c (grub_mdraid_detect): Add start_sector
parameter. Set its pointer target to 0 for 0.9 metadata, or to the
`data_offset' value from the superblock for 1.x metadata.
* disk/raid.c (grub_raid_read): Offset reads by the start sector of
data on the device.
(insert_array): Record the start sector of data on the device.
(grub_raid_register): Pass start_sector parameters to
grub_raid_list->detect and insert_array.
* include/grub/raid.h (struct grub_raid_array): Add start_sector
member.
(struct grub_raid): Add start_sector parameter to `detect'.
2010-07-18 18:31:10 +01:00
Vladimir 'phcoder' Serbinenko
a531fd134d
Split common usbserial function. PL2303 skeleton
2010-07-18 19:10:57 +02:00
BVK Chaitanya
3e96a6a108
merge with mainline
2010-07-18 22:03:28 +05:30
BVK Chaitanya
502cddef68
merge with mainline
2010-07-18 21:34:03 +05:30
BVK Chaitanya
f745095a37
merge with mainline
2010-07-18 21:23:58 +05:30
Vladimir 'phcoder' Serbinenko
24494d478a
Add fini routines for usbserial and rename grub_usbserial to grub_ftdi
2010-07-18 17:40:42 +02:00
BVK Chaitanya
f6e59c46e1
update dynamic cmd dispatch with scripts support
2010-07-18 20:46:21 +05:30
Vladimir 'phcoder' Serbinenko
fd5b663793
Configure word length
2010-07-18 15:07:59 +02:00
Vladimir 'phcoder' Serbinenko
1da07b142b
some serial config support
2010-07-18 14:43:23 +02:00
Vladimir 'phcoder' Serbinenko
8c8e269906
Encapsulate serial config in dedicated structure
2010-07-18 13:40:48 +02:00
Vladimir 'phcoder' Serbinenko
34364df689
usbserial basic support. Works in qemu
2010-07-18 12:53:35 +02:00
Vladimir 'phcoder' Serbinenko
75eb7d1116
Restructure serial in order to prepare for usbserial. As a byproduct simultaneous serial consoles are possible
2010-07-18 01:37:19 +02:00
Vladimir 'phcoder' Serbinenko
b92c6ff67f
Merge mainline into usb
2010-07-17 02:44:33 +02:00
Vladimir 'phcoder' Serbinenko
3222efaff3
* include/grub/bsdlabel.h (GRUB_PC_PARTITION_BSD_LABEL_WHOLE_DISK_PARTITION): New definition.
...
* partmap/bsdlabel.c (bsdlabel_partition_map_iterate): Use FreeBSD
delta determination style. Works with most NetBSD partitions too.
2010-07-17 01:57:48 +02:00
Vladimir 'phcoder' Serbinenko
af0bedf8af
merge mainline into usb
2010-07-17 01:14:13 +02:00
Grégoire Sutre
8d9a5b15e3
Discard improperly nested partitions.
2010-07-14 11:26:17 +02:00
Paulo de Rezende Pinatti
f8795693f1
Added support to netdisk specified in the form (net,protocol,server_ip,username,password)
...
an to list its information with command ls.
* fs/ieee1275/ofnet.c (grub_ofnet_open): parse parameters to determine netdisk data
* fs/ieee1275/ofnet.c (grub_ofnet_close): dealloc netdisk data
* include/grub/disk.h: added struct grub_netdisk_data
* include/grub/ieee1275/ofnet.h: added newline
* kern/disk.c (grub_disk_open): ignore partition check for netdisk
* normal/misc.c (grub_normal_print_device_info): added support to list netdisk information
2010-07-13 11:22:35 -03:00
BVK Chaitanya
d18b05c4e3
merge with mainline
2010-07-12 17:29:44 +05:30
BVK Chaitanya
05df19acd5
merge with mainline
2010-07-12 17:03:01 +05:30
BVK Chaitanya
9ec82092f1
merge with mainline
2010-07-11 21:40:25 +05:30
BVK Chaitanya
2643019702
merge with mainline
2010-07-11 21:20:26 +05:30
BVK Chaitanya
7925f8e9cf
merge with mainline
2010-07-11 21:14:18 +05:30
BVK Chaitanya
09e06f8e75
merge with mainline
2010-07-11 18:10:53 +05:30
Vladimir 'phcoder' Serbinenko
4274c30fbc
Restructure SCSI .id handling.
...
Reported and tested by: Aleš Nesrsta.
* disk/ata.c (grub_atapi_close): Removed. All users updated.
(grub_atapi_dev): Changed .name to "ata". New field .id.
* disk/usbms.c (grub_usbms_close): Removed. All users updated.
(grub_usbms_dev): New field .id.
* disk/scsi.c (grub_scsi_iterate): Generate name.
(grub_scsi_open): Parse name.
* include/grub/scsi.h (grub_make_scsi_id): New function.
(grub_scsi_dev): Change iterate and open to number instead of naming
busses. All users updated.
(grub_scsi): Remove name. Add .bus.
2010-07-10 02:59:33 +02:00
starous
1b43dba911
USB hot-plugging
2010-07-08 22:54:35 +02:00
starous
1a0742d4e2
USB hub support
2010-07-05 19:02:05 +02:00
Vladimir 'phcoder' Serbinenko
df3eb88f04
Bidi and diacritics support.
...
* Makefile.in (widthspec.bin): New target.
(widthspec.h): Likewise.
(TARGET_CFLAGS): Add -DHAVE_UNIFONT_WIDTHSPEC=1 if font was available.
* autogen.sh: Generate unidata.c.
* commands/cat.c (grub_cmd_cat): Don't use grub_putchar.
* commands/ls.c (grub_ls_list_devices): Likewise.
(grub_ls_list_files): Likewise.
* commands/minicmd.c (grub_mini_cmd_cat): Likewise.
(grub_mini_cmd_lsmod): Likewise.
* commands/read.c: Likewise.
* kern/corecmd.c (grub_core_cmd_ls): Likewise.
* kern/rescue_reader.c (grub_rescue_read_line): Likewise.
* lib/arg.c (grub_arg_show_help): Likewise.
* lib/crypto.c (grub_password_get): Likewise.
* normal/auth.c (grub_username_get): Likewise.
* normal/misc.c (grub_normal_print_device_info): Likewise.
* commands/help.c (grub_cmd_help): Use grub_unicode_aglomerate_comb.
* conf/common.rmk (grub_mkfont_SOURCES): Add unidata.c.
(gfxmenu_mod_SOURCES): Add gfxmenu/font.c.
(normal/charset.c_DEPENDENCIES): New variable.
(normal_mod_SOURCES): Add normal/charset.c and unidata.c.
(pkglib_MODULES): Remove charset.mod.
(charset_mod_SOURCES): Removed.
(charset_mod_CFLAGS): Likewise.
(charset_mod_LDFLAGS): Likewise.
(pkglib_MODULES) [ieee1275]: Remove terminfo.mod.
* conf/powerpc-ieee1275.rmk (kernel_img_SOURCES): Add term/terminfo.c
and term/tparm.c.
* conf/sparc64-ieee1275.rmk (kernel_img_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (kernel_img_SOURCES): Likewise.
(kernel_img_HEADERS): Add terminfo.h.
* font/font.c (ascii_glyph_lookup): Return NULL on failure.
Fill ->font. Reverse ascii bitmaps.
(grub_font_get_xheight): New function.
* font/font.c (grub_font_get_string_width): Moved from here ...
* gfxmenu/font.c (grub_font_get_string_width): ... here.
* font/font.c (grub_font_draw_string): Moved from here ...
* gfxmenu/font.c (grub_font_draw_string): ... here.
* font/font.c (grub_font_dup_glyph): New function.
(grub_font_blit_glyph): Likewise.
(grub_font_blit_glyph_mirror): Likewise.
(blit_comb): Likewise.
(grub_font_construct_dry_run): Likewise.
(grub_font_get_constructed_device_width): Likewise.
(grub_font_construct_glyph): Likewise.
* include/grub/charset.h (grub_ucs4_to_utf8): New proto.
* include/grub/misc.h (grub_utf8_to_ucs4): Moved from here ...
* include/grub/charset.h (grub_utf8_to_ucs4): ... here.
* include/grub/font.h (GRUB_FONT_CODE_CHAR_MASK): New constant.
(GRUB_FONT_CODE_RIGHT_JOINED): Likewise.
(GRUB_FONT_CODE_LEFT_JOINED): Likewise.
(grub_font_get_xheight): New proto.
(grub_font_get_constructed_device_width): Likewise.
(grub_font_construct_glyph): Likewise.
* include/grub/font.h (grub_font_get_string_width): Moved from here ...
* include/grub/gfxmenu_view.h (grub_font_get_string_width): ... here.
* include/grub/font.h (grub_font_draw_string): Moved from here ...
* include/grub/gfxmenu_view.h (grub_font_draw_string): ... here.
* include/grub/i386/vga_common.h (grub_console_putchar): Moved from here..
* include/grub/i386/pc/console.h (grub_console_putchar): ... here.
* include/grub/i386/vga_common.h (grub_console_real_putchar): Removed.
(grub_console_getcharwidth): Likewise.
* include/grub/misc.h (grub_xputs): New proto.
(grub_puts): Inlined.
* include/grub/normal.h (grub_print_ucs4): Add margin specification.
(grub_normal_get_line_counter): Removed.
(grub_install_newline_hook): Likewise.
(grub_normal_get_char_counter): New proto.
(grub_normal_reset_more): Likewise.
(grub_xputs_normal): Likewise.
* include/grub/powerpc/ieee1275/console.h: Removed.
* include/grub/sparc64/ieee1275/console.h: Likewise.
* include/grub/term.h (GRUB_TERM_CODE_TYPE_MASK): New definition.
(GRUB_TERM_CODE_TYPE_ASCII): Likewise.
(GRUB_TERM_CODE_TYPE_CP437): Likewise.
(GRUB_TERM_CODE_TYPE_UTF8_LOGICAL): Likewise.
(GRUB_TERM_CODE_TYPE_UTF8_VISUAL): Likewise.
(GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS): Likewise.
(grub_term_input): Pass reference to self. All users updated.
(grub_term_output): Pass grub_unicode_glyph to putchar and getcharwidth.
Pass reference to self. New fields normal_color, highlight_color and
data. All users updated.
(grub_putchar): Removed.
(grub_putcode): Remove EXPORT_FUNC since it's not in kernel anymore.
(grub_unicode_estimate_width): New function.
(grub_term_getcharwidth): Add defaults.
(GRUB_TERM_DEFAULT_NORMAL_COLOR): New definition.
(GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR): Likewise.
(GRUB_TERM_DEFAULT_STANDARD_COLOR): Likewise.
(grub_cls): Remove EXPORT_FUNC.
(grub_setcolorstate): Inline.
(grub_newline_hook): Removed.
* include/grub/terminfo.h: Rewritten. All users updated.
* include/grub/unicode.h: New file.
* include/grub/video.h (grub_video_signed_rect): New type.
* kern/emu/console.c (grub_console_highlight_color): Removed.
(grub_console_normal_color): Likewise.
(grub_console_standard_color): Made static.
(grub_ncurses_putchar): Remove mapping.
(grub_ncurses_getcharwidth): Removed.
(grub_ncurses_term_output): Declare as GRUB_TERM_CODE_TYPE_ASCII.
(grub_ncurses_setcolor): Removed.
(grub_ncurses_getcolor): Likewise.
* kern/i386/pc/startup.S (grub_console_real_putchar): Renamed to ...
(grub_console_putchar): ... this.
(grub_console_putchar): Handle argument difference.
* kern/ieee1275/init.c (grub_machine_init): Split console_init into
console_init_early and console_init_lately.
* kern/sparc64/ieee1275/init.c (grub_machine_init): Likewise.
* kern/misc.c (grub_puts): Removed.
(grub_vprintf): Store UTF-8 string instead of outputting it directly.
(grub_vsnprintf_real): Remove str = NULL support.
* kern/misc.c (grub_utf8_to_ucs4): Move from here ...
* normal/charset.c (grub_utf8_to_ucs4): ... here.
* kern/term.c (grub_putcode): Renamed to ...
(grub_putcode_dumb): ... this. Pass grub_unicode_glyph instead of code.
(grub_putchar): Removed.
(grub_xputs_dumb): New function.
(grub_xputs): New variable.
* lib/charset.c: Move from here ...
* normal/charset.c: ... to here.
(grub_ucs4_to_utf8): New function.
(grub_ucs4_to_utf8_alloc): Use grub_ucs4_to_utf8.
(join_types): New variable.
(unpack_join): New function.
(bidi_types): New variable.
(unpack_bidi): New function.
(get_bidi_type): Likewise.
(get_join_type): Likewise.
(is_mirrored): Likewise.
(grub_unicode_get_comb_type): Likewise.
(grub_unicode_estimate_width) [HAVE_UNIFONT_WIDTHSPEC]: Likewise.
(is_type_after): Likewise.
(grub_unicode_aglomerate_comb): Likewise.
(bidi_line_wrap): Likewise.
(grub_bidi_line_logical_to_visual): Likewise.
(grub_bidi_logical_to_visual): Likewise.
(grub_unicode_mirror_code): Likewise.
(grub_unicode_shape_code): Likewise.
* normal/cmdline.c (grub_cmdline_get): Reset more counter.
Don't use grub_putchar.
* normal/main.c (grub_normal_init_page): Use grub_putcode.
(grub_normal_reader_init): Likewise.
(grub_xputs_saved): New variable.
(GRUB_MOD_INIT): Set grub_xputs.
(GRUB_MOD_FINI): Restore grub_xputs.
* normal/menu.c (grub_wait_after_message): Don't use grub_putchar.
(menu_init): Avoid printing gfxmenu error.
(show_menu): Use grub_normal_get_char_counter.
* normal/menu_entry.c (update_screen): Fix out-of-array.
(complete): Avoid NULL dereferencing.
* grub_menu_entry_run (grub_menu_entry_run): Don't use putchar.
* normal/menu_text.c (print_spaces): Removed.
(grub_print_ucs4): Likewise.
(grub_print_message_indented): Use grub_print_ucs4.
(print_message): Use grub_putcode.
(print_entry): Hanlde diacritics.
* normal/term.c (term_state): New type.
(grub_more_lines): Removed.
(term_states): New variable.
(grub_normal_line_counter): Renamed to ..
(grub_normal_char_counter): ...this. All users updated.
(grub_normal_get_line_counter): Renamed to ...
(grub_normal_get_char_counter): ... this.
(grub_normal_reset_more): New function.
(process_newline): Removed.
(print_more): New function.
(grub_install_newline_hook): Removed.
(map_code): New function.
(grub_puts_terminal): Use grub_print_ucs4.
(putglyph): New function.
(putcode_real): Likewise.
(grub_putcode): Use putcode_real.
(get_maxwidth): New function.
(get_startwidth): Likewise.
(print_ucs4_terminal): Likewise.
(find_term_state): Likewise.
(put_glyphs_terminal): Likewise.
(print_backlog): Likewise.
(print_ucs4_real): Likewise.
(grub_print_ucs4): Likewise.
(grub_xputs_normal): Likewise.
* term/efi/console.c (grub_console_putchar): Output diacritics.
(grub_console_getcharwidth): Removed.
(grub_console_term_output): Declare as GRUB_TERM_CODE_TYPE_UCS4_VISUAL.
* term/gfxterm.c (clear_char): Free chars.
(scroll_up): Avoid leaking memory.
(grub_gfxterm_putchar): Support diacritics.
(grub_video_term): Declare as GRUB_TERM_CODE_TYPE_UCS4_VISUAL.
* term/i386/pc/console.c (grub_console_term_output): Declare as
GRUB_TERM_CODE_TYPE_VGA.
* term/i386/pc/vga.c (grub_vga_term): Declare as
GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS.
* term/i386/pc/vga_text.c (grub_vga_text_term): Declare as
GRUB_TERM_CODE_TYPE_VGA.
* term/i386/vga_common.c (map_char): Removed.
(grub_console_putchar): Likewise.
(grub_console_getcharwidth): Likewise.
* term/ieee1275/ofconsole.c: Simplify using terminfo.
(colors): Reordered to match terminfo.
(grub_ofconsole_normal_color): Removed.
(grub_ofconsole_writeesc): Likewise.
(grub_ofconsole_highlight_color): Likewise.
(grub_ofconsole_getcharwidth): Likewise.
(grub_ofconsole_setcolorstate): Likewise.
(grub_ofconsole_setcolor): Likewise.
(grub_ofconsole_getcolor): Likewise.
(grub_ofconsole_readkey): Renamed to ...
(readkey): ... this. Remove escape sequence handling. Return -1 on no
key.
(grub_ofconsole_checkkey): Removed.
(grub_ofconsole_getkey): Likewise.
(grub_ofconsole_getxy): Likewise.
(grub_ofconsole_gotoxy): Likewise.
(grub_ofconsole_cls): Likewise.
(grub_ofconsole_refresh): Likewise.
(grub_ofconsole_terminfo_input): New struct.
(grub_ofconsole_terminfo_output): Likewise.
(grub_ofconsole_term_input): Use terminfo.
(grub_ofconsole_term_output): Likewise.
(grub_console_init): Split into ...
(grub_console_init_early): ...this and ...
(grub_console_init_lately): ...this. Use terminfo.
(grub_ofconsole_putchar): Renamed to ...
(put): ... this. Remove mapping.
(grub_ofconsole_term_output): Declare as GRUB_TERM_CODE_TYPE_ASCII.
* term/serial.c: Simplify using terminfo.
(xpos): Removed.
(ypos): Likewise.
(keep_track): Likewise.
(registered): Likewise.
(input_buf): Likewise.
(npending): Likewise.
(serial_translate_key_sequence): Likewise.
(fill_input_buf): Likewise.
(grub_serial_checkkey): Likewise.
(grub_serial_getkey): Likewise.
(grub_serial_getxy): Likewise.
(grub_serial_gotoxy): Likewise.
(grub_serial_putchar): Likewise.
(grub_serial_cls): Likewise.
(grub_serial_setcolorstate): Likewise.
(grub_serial_setcursor): Likewise.
(serial_hw_init): Use serial_hw_fetch.
(grub_serial_terminfo_input): New variable.
(grub_serial_terminfo_output): Likewise.
(grub_serial_term_input): Use terminfo.
(grub_serial_term_output): Likewise.
* term/terminfo.c (putstr): Use put.
(grub_terminfo_all_free): New function
(grub_terminfo_set_current): New types vt100-color, ieee1275 and dumb.
(grub_terminfo_output_register): New function.
(grub_terminfo_output_unregister): Likewise.
(grub_terminfo_getxy): Likewise.
(grub_terminfo_readkey): Likewise.
(grub_terminfo_checkkey): Likewise.
(grub_terminfo_getkey): Likewise.
(grub_terminfo_input_init): Likewise.
(print_terminfo): Likewise.
(grub_cmd_terminfo): Handle encoding.
(grub_terminfo_gotoxy): Track position.
(grub_terminfo_cls): Likewise.
(grub_terminfo_putchar): Likewise.
(grub_terminfo_setcolorstate): Handle colors
(grub_terminfo_cursor_on): This ...
(grub_terminfo_cursor_off): ... and this merged into ...
(grub_terminfo_setcursor): ... this.
* term/tparm.c (grub_terminfo_tparm): Avoid NULL dereferencing.
* unicode/ArabicShaping.txt: New file (imported from Unicode).
* unicode/BidiMirroring.txt: Likewise.
* unicode/UnicodeData.txt: Likewise.
* unicode/COPYING: Likewise.
* util/grub-editenv.c (grub_putchar): Removed.
(grub_xputs_real): New function.
(grub_xputs): New variable.
* util/grub-fstest.c (grub_putchar): Removed.
(grub_xputs_real): New function.
(grub_xputs): New variable.
* util/grub-mkdevicemap.c (grub_putchar): Removed.
(grub_xputs_real): New function.
(grub_xputs): New variable.
* util/grub-probe.c (grub_putchar): Removed.
(grub_xputs_real): New function.
(grub_xputs): New variable.
* util/grub-script-check.c (grub_putchar): Removed.
(grub_xputs_real): New function.
(grub_xputs): New variable.
* util/i386/pc/grub-setup.c (grub_putchar): Removed.
(grub_xputs_real): New function.
(grub_xputs): New variable.
* util/import_unicode.py: New file.
* util/grub-mkfont.c (ft_errmsgs): New array.
(grub_glyph_info): Make bitmap a pointer.
(file_formats): New type WIDTH_SPEC.
(grub_font_info): New members glyphs_unsorted, glyphs_sorted, num_glyphs.
(options): Add width-spec.
(help): Likewise.
(add_char): Renamed to ...
(add_glyph): ... this.
(add_glyph): Use index. Show freetype errors. Cut blank space at borders.
(glyph_replace): New type.
(subst_rightjoin), (subst_leftjoin), (subst_medijoin): New variables.
(add_char): New function.
(add_subst): Likewise.
(process_cursive): Likewise.
(add_font): Handle GSUB.
(write_font_width_spec): New function.
(main): Sort glyphs.
* commands/minicmd.c (grub_mini_cmd_clear): Moved from here ...
* normal/main.c (grub_mini_cmd_clear): ..here. All users updated.
* kern/term.c (grub_cls): Moved from here...
* normal/term.c (grub_cls): ... here.
2010-07-02 22:16:35 +02:00
Vladimir 'phcoder' Serbinenko
e8d0a8f85c
Merge mainline into bidi
2010-07-02 19:35:07 +02:00
Colin Watson
50f0bcdab5
* include/grub/types.h: Define the C99-style PRIxGRUB_SIZE macro,
...
suitable for using within the format argument of printf when
converting grub_size_t.
* disk/usbms.c (grub_usbms_transfer): Use PRIxGRUB_SIZE rather than
"x" to convert grub_size_t arguments.
2010-07-02 18:04:54 +01:00
Vladimir 'phcoder' Serbinenko
919e37b0ac
Inline setcolorstate and move grub_Cls out of kernel.img
2010-07-02 18:20:48 +02:00
Colin Watson
e03ed6c1ee
* include/grub/misc.h (grub_reboot): Declare as noreturn.
...
* kern/efi/efi.c (grub_reboot): Don't return, even if reset_system
fails.
(grub_halt): Likewise.
* kern/ieee1275/openfw.c (grub_reboot): Don't return, even if
reset-all fails.
(grub_halt): Don't return, even if all of shut-down, power-off, and
poweroff fail.
2010-07-02 13:47:14 +01:00
Vladimir 'phcoder' Serbinenko
ec1d04f1de
Yeeloong firmware port.
...
* boot/mips/yeeloong/fwstart.S: New file.
* bus/cs5536.c (gpiodump): New const.
(set_io_space): New function.
(set_iod): Likewise.
(set_p2d): Likewise.
(grub_cs5536_init_geode): Likewise.
* commands/mips/yeeloong/lsspd.c: New file.
* conf/mips-qemu-mips.rmk (pkglib_MODULES): Add serial.mod.
(serial_mod_SOURCES): New variable.
(serial_mod_CFLAGS): Likewise.
(serial_mod_LDFLAGS): Likewise.
* conf/mips-yeeloong.rmk (kernel_img_SOURCES): Add term/serial.c,
term/terminfo.c and term/tparm.c.
(pkglib_IMAGES): Add fwstart.img.
(fwstart_img_SOURCES): New variable.
(fwstart_img_CFLAGS): Likewise.
(fwstart_img_ASFLAGS): Likewise.
(fwstart_img_LDFLAGS): Likewise.
(fwstart_img_FORMAT): Likewise.
(pkglib_MODULES): Add lsspd.mod.
(lsspd_mod_SOURCES): New variable.
(lsspd_mod_CFLAGS): Likewise.
(lsspd_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add halt.mod.
(halt_mod_SOURCES): New variable.
(halt_mod_CFLAGS): Likewise.
(halt_mod_LDFLAGS): Likewise.
* conf/mips.rmk (pkglib_MODULES): Remove serial.mod.
(serial_mod_SOURCES): Removed.
(serial_mod_CFLAGS): Likewise.
(serial_mod_LDFLAGS): Likewise.
* disk/ata.c (check_device): New function.
(grub_ata_device_initialize): Use check_device.
(grub_ata_iterate): Recheck devices.
(grub_ata_open): Likewise.
(grub_atapi_iterate): Likewise.
(grub_atapi_open): Likewise.
* include/grub/ata.h (GRUB_ATA_CH0_PORT1): New macro.
(GRUB_ATA_CH1_PORT1): Likewise.
(GRUB_ATA_CH0_PORT2): Likewise.
(GRUB_ATA_CH1_PORT2): Likewise.
* include/grub/mips/loongson.h: New file.
* include/grub/mips/yeeloong/ec.h: Likewise.
* include/grub/mips/yeeloong/serial.h (GRUB_MACHINE_SERIAL_PORT): New definition.
(GRUB_MACHINE_SERIAL_DIVISOR_115200): Likewise.
(GRUB_MACHINE_SERIAL_PORTS) [ASM_FILE]: Remove.
* include/grub/misc.h (grub_halt): Declare as noreturn.
* include/grub/serial.h (UART_ENABLE_FIFO): Renamed to ...
(UART_ENABLE_FIFO_TRIGGER14): ... this. All users updated.
(UART_ENABLE_FIFO_TRIGGER1): New definition.
(UART_ENABLE_DTRRTS): Likewise.
(UART_ENABLE_MODEM): Removed.
(UART_ENABLE_OUT2): New const.
* include/grub/term.h (grub_term_register_input_active): New function.
(grub_term_register_output_active): Likewise.
* kern/mips/startup.S [GRUB_MACHINE_MIPS_YEELOONG]: Handle 0xffffffff
argument.
* kern/mips/yeeloong/init.c (grub_get_rtc): Macroify.
(init_pci): New function.
(grub_machine_init): Execute platform init when firmware. Init serial.
(grub_halt): Implement.
(grub_exit): Likewise.
(grub_reboot): Likewise.
* term/serial.c (serial_hw_init): Update macros.
[GRUB_MACHINE_MIPS_YEELOONG]: Init on startup.
* util/grub-mkimage.c (image_target_desc): New id IMAGE_YEELOONG_FLASH.
(image_targets): New target mipsel-yeeloong-flash.
(generate_image): Support IMAGE_YEELOONG_FLASH.
* video/sm712.c (GRUB_SM712_TOTAL_MEMORY_SPACE): New definition.
(grub_video_sm712_setup): Init card.
(grub_video_sm712_set_palette): Removed.
* video/sm712_init.c: New file.
2010-07-01 03:16:56 +02:00
Vladimir 'phcoder' Serbinenko
b7e79e8a6a
Merge mainline into yeeloongfw
2010-06-30 02:30:05 +02:00
Manoel R. Abranches
3ec6213b17
Clean Debug messages
2010-06-29 06:50:15 -03:00
Vladimir 'phcoder' Serbinenko
4045dee1b9
Use normal parser for menu entries.
...
Reported by: Thomas Frauendorfer
* include/grub/parser.h (grub_parser_execute): Don't export.
* normal/menu.c (grub_menu_execute_entry_real): New function.
(grub_menu_execute_entry): Use grub_menu_execute_entry_real.
2010-06-28 12:42:50 +02:00
Vladimir 'phcoder' Serbinenko
2a1d16154d
Merge mainline into newreloc
2010-06-24 21:22:40 +02:00
Manoel R. Abranches
1edb7287ff
Parse ipv6 header on incoming packets.
2010-06-23 14:49:46 -03:00
Manoel R. Abranches
8c599704a7
Network code specific for ieee1275 machines.
...
Used to parse BOOTP packet from the server and use write/read on the network card.
May be removed later.
2010-06-21 19:20:55 -03:00
Manoel R. Abranches
60cdb895da
Adaptation for the new protocols and interface structs.
...
implementation of receive in the protocols.
Also all unwanted packets are discarded.
2010-06-21 19:15:45 -03:00
Manoel R. Abranches
c3639ae731
File manipulation. Based in OF implementation.
...
For debug porpouse and will be changed later.
2010-06-21 19:13:26 -03:00
Manoel R. Abranches
d17a9fea4a
Add interface struct for communication between protocols and protocols stack.
...
Changed the protocols structs to use one struct for each layer.
2010-06-21 19:05:14 -03:00
starous
12cd7239d9
Faster OHCI, USB hub support, UHCI portstatus corr.
2010-06-21 21:12:20 +02:00
Vladimir 'phcoder' Serbinenko
8e50ec9f05
Merge mainline into cirrus
2010-06-21 02:15:49 +02:00
Vladimir 'phcoder' Serbinenko
de24ab9b0d
Fix grub_vga_palette_write
2010-06-21 02:07:45 +02:00
Vladimir 'phcoder' Serbinenko
4d88b9aec7
Init cirrus ourselves instead of calling videobios
2010-06-21 01:02:48 +02:00
Vladimir 'phcoder' Serbinenko
8c0346515d
Add GRUB_PCI_REG_STATUS_*_ENABLE
2010-06-21 01:01:26 +02:00
Vladimir 'phcoder' Serbinenko
d246fc0368
Improve macroification of VGA registers.
2010-06-21 00:58:43 +02:00
Vladimir 'phcoder' Serbinenko
05e5187978
Cirrus 5446 and Bochs video cards support.
...
* conf/i386.rmk (pkglib_MODULES): Add video_cirrus.mod and
video_bochs.mod
(video_cirrus_mod_SOURCES): New variable.
(video_cirrus_mod_CFLAGS): Likewise.
(video_cirrus_mod_LDFLAGS): Likewise.
(video_bochs_mod_SOURCES): Likewise.
(video_bochs_mod_CFLAGS): Likewise.
(video_bochs_mod_LDFLAGS): Likewise.
* include/grub/vga.h: New file.
* include/grub/video_fb.h (grub_video_fb_doublebuf_blit_init): Removed.
(grub_video_fb_set_page_t): New type.
(grub_video_fb_setup): New prototype.
(grub_video_fb_swap_buffers): Likewise.
(grub_video_fb_get_info_and_fini): Likewise.
* term/i386/pc/vga_text.c (CRTC_ADDR_PORT): Moved to include/grub/vga.h.
(CRTC_DATA_PORT): Likewise.
(CRTC_CURSOR): Likewise.
(CRTC_CURSOR_ADDR_HIGH): Likewise.
(CRTC_CURSOR_ADDR_LOW): Likewise.
(CRTC_CURSOR_DISABLE): Likewise.
(update_cursor): Use grub_vga_cr_write.
(grub_vga_text_setcursor): Likewise.
* video/bochs.c: New file.
* video/fb/video_fb.c (render_target): Moved into framebuffer variable.
(palette): Likewise.
(palette_size): Likewise.
(framebuffer): New variable.
(grub_video_fb_init): Use 'framebuffer'.
(grub_video_fb_fini): Likewise.
(grub_video_fb_get_info): Likewise.
(grub_video_fb_get_palette): Likewise.
(grub_video_fb_set_palette): Likewise.
(grub_video_fb_set_viewport): Likewise.
(grub_video_fb_get_viewport): Likewise.
(grub_video_fb_map_color): Likewise.
(grub_video_fb_map_rgb): Likewise.
(grub_video_fb_map_rgba): Likewise.
(grub_video_fb_unmap_color): Likewise.
(grub_video_fb_unmap_color_int): Likewise.
(grub_video_fb_fill_rect): Likewise.
(grub_video_fb_blit_bitmap): Likewise.
(grub_video_fb_blit_render_target): Likewise.
(grub_video_fb_scroll): Likewise.
(grub_video_fb_create_render_target): Likewise.
(grub_video_fb_doublebuf_blit_init): Likewise.
(grub_video_fb_set_active_render_target): Handle doublebuffering.
(doublebuf_pageflipping_update_screen): New function.
(doublebuf_pageflipping_init): Likewise.
(grub_video_fb_setup): Likewise.
(grub_video_fb_swap_buffers): Likewise.
(grub_video_fb_get_info_and_fini): Likewise.
* video/i386/pc/vbe.c (framebuffer): Remove all doublebuffering fields.
All users updated.
(doublebuf_pageflipping_commit): Restructured into ...
(doublebuf_pageflipping_set_page): ... this.
(doublebuf_pageflipping_update_screen): Removed.
(doublebuf_pageflipping_init): Likewise.
(double_buffering_init): Likewise.
(grub_video_vbe_setup): Use grub_video_fb_setup.
(grub_video_vbe_swap_buffers): Removed.
(grub_video_vbe_set_active_render_target): Likewise.
(grub_video_vbe_get_active_render_target): Likewise.
(grub_video_vbe_get_info_and_fini): Use grub_video_fb_get_info_and_fini.
(grub_video_vbe_adapter): Use grub_video_fb_swap_buffers,
grub_video_fb_set_active_render_target and
grub_video_fb_get_active_render_target.
* video/i386/pc/vga.c (SEQUENCER_ADDR_PORT): Move to include/grub/vga.h.
(SEQUENCER_DATA_PORT): Likewise.
(MAP_MASK_REGISTER): Likewise.
(CRTC_ADDR_PORT): Likewise.
(CRTC_DATA_PORT): Likewise.
(START_ADDR_HIGH_REGISTER): Likewise.
(START_ADDR_LOW_REGISTER): Likewise.
(GRAPHICS_ADDR_PORT): Likewise.
(GRAPHICS_DATA_PORT): Likewise.
(READ_MAP_REGISTER): Likewise.
(INPUT_STATUS1_REGISTER): Likewise.
(INPUT_STATUS1_VERTR_BIT): Likewise.
(get_map_mask): Use grub_vga_sr_read.
(set_map_mask): Use grub_vga_sr_write.
(set_read_map): Use grub_vga_gr_write.
(set_start_address): Use grub_vga_cr_write.
* video/sm712.c (framebuffer): Remove leftover fields.
2010-06-20 14:15:20 +02:00
BVK Chaitanya
2e1310bc7c
merge with mainline
2010-06-13 10:22:38 +05:30
BVK Chaitanya
eedda76883
merge with mainline
2010-06-13 09:58:24 +05:30
BVK Chaitanya
49e38cf475
merge with mainline
2010-06-13 09:48:47 +05:30
Vladimir 'phcoder' Serbinenko
d49703d151
Add priorities support
2010-06-12 17:38:48 +02:00
BVK Chaitanya
20ebf73276
merge with mainline
2010-06-12 20:36:46 +05:30
Colin Watson
9038c767e3
merge mainline
2010-06-12 15:01:46 +01:00
Colin Watson
7beac90c5f
Avoid false positives in fs.lst, partmap.lst, and video.lst due to
...
prototype declarations.
* genmk.rb (PModule::rule): Define GRUB_LST_GENERATOR when
generating fs, partmap, and video lists.
* include/grub/fs.h (grub_fs_register): Omit prototype if
GRUB_LST_GENERATOR is defined.
* include/grub/partition.h (grub_partition_map_register): Likewise.
* include/grub/video.h (grub_video_register): Likewise.
2010-06-12 14:33:09 +01:00
Javier Martín
1c8f0f8d11
* include/grub/types.h: Check for GRUB_CPU_SIZEOF_LONG when appropriate.
2010-06-12 14:50:07 +02:00
Colin Watson
934302d00b
merge mainline
2010-06-12 12:17:28 +01:00
BVK Chaitanya
95af254928
merge with mainline
2010-06-12 16:32:06 +05:30
Colin Watson
8253ee6bd7
merge mainline up to r2075 (videomask merge)
2010-06-12 11:30:11 +01:00
BVK Chaitanya
b2d0e6c3fd
merge with mainline
2010-06-12 13:55:31 +05:30
BVK Chaitanya
b06f83e3ba
a better fix
2010-06-12 11:06:02 +05:30
Colin Watson
283af07aff
* include/grub/efi/uga_draw.h (GRUB_EFI_UGA_GLT_MAX): Rename to ...
...
(GRUB_EFI_UGA_BLT_MAX): ... this (typo fix).
2010-06-11 22:15:35 +01:00
Vladimir 'phcoder' Serbinenko
3a37e3226b
Use FOR_* macros instead of *_iterate whenever possible.
...
* commands/handler.c: Removed.
* commands/help.c (grub_cmd_help): Use FOR_COMMANDS.
* commands/minicmd.c (grub_mini_cmd_lsmod): Use FOR_DL_MODULES.
* conf/any-emu.rmk (kernel_img_SOURCES): Remove kern/handler.c.
* conf/common.rmk (script/lexer.c_DEPENDENCIES): Add grub_script.yy.h.
(grub_probe_SOURCES): Remove kern/parser.c.
(util/grub-script-check.c_DEPENDENCIES): Removed.
(grub_script_check_SOURCES): Remove kern/handler.c, kern/parser.c
and grub_script_check_init.c.
(grub_script_check_init.lst): Removed.
(grub_script_check_init.h): Likewise.
(grub_script_check_init.c): Likewise.
(pkglib_MODULES): Remove handler.mod and sh.mod.
(handler_mod_SOURCES): Removed.
(handler_mod_CFLAGS): Likewise.
(handler_mod_LDFLAGS): Likewise.
(normal_mod_SOURCES): Remove normal/handler.c.
Add script/main.c, script/script.c, script/execute.c,
script/function.c, script/lexer.c, grub_script.tab.c
and grub_script.yy.c.
* conf/i386-coreboot.rmk (kernel_img_SOURCES): Remove kern/handler.c.
* conf/i386-ieee1275.rmk (kernel_img_SOURCES): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Likewise.
(grub_setup_SOURCES): Remove kern/parser.c.
* conf/i386-qemu.rmk (kernel_img_SOURCES): Remove kern/handler.c.
* conf/mips-qemu-mips.rmk (kernel_img_SOURCES): Likewise.
* conf/mips-yeeloong.rmk (kernel_img_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (kernel_img_SOURCES): Likewise.
* conf/sparc64-ieee1275.rmk (kernel_img_SOURCES): Likewise.
(grub_setup_SOURCES): Remove kern/parser.c.
* conf/x86-efi.rmk (kernel_img_SOURCES): Remove kern/handler.c.
* gettext/gettext.c (grub_gettext_delete_list): Don't use grub_list_pop.
* include/grub/command.h (grub_command_iterate): Removed.
(FOR_COMMANDS): New macro.
* include/grub/dl.h (grub_dl): New member next.
(grub_dl_iterate): Removed.
(grub_dl_head): New variable declaration.
(FOR_DL_MODULES): New macro.
* include/grub/fs.h: Include list.h.
(grub_fs): Make next first element.
(grub_fs_list): New variable declaration.
(grub_fs_register): Make inline.
(grub_fs_unregister): Likewise.
(grub_fs_iterate): Removed.
(FOR_FILESYSTEMS): New macro.
* include/grub/handler.h: Removed.
* include/grub/list.h (grub_list_hook_t): Removed.
(grub_list_test_t): Likewise.
(grub_list_pop): Likewise.
(grub_list_iterate): Likewise.
(grub_list_insert): Likewise.
(FOR_LIST_ELEMENTS): New macro.
* include/grub/parser.h (grub_parser_class): Removed.
(grub_parser_register): Likewise.
(grub_parser_unregister): Likewise.
(grub_parser_get_current): Likewise.
(grub_parser_set_current): Likewise.
(grub_register_rescue_parser): Likewise.
(grub_rescue_parse_line): New function.
* include/grub/partition.h (FOR_PARTITION_MAPS): Use FOR_LIST_ELEMENTS.
* include/grub/script_sh.h (grub_script_function_list): New variable
declaration.
(FOR_SCRIPT_FUNCTIONS): New macro.
(grub_script_function_iterate): Removed.
(grub_normal_parse_line): New prototype.
* include/grub/term.h (FOR_ACTIVE_TERM_INPUTS): Use FOR_LIST_ELEMENTS.
(FOR_DISABLED_TERM_INPUTS): Likewise.
(FOR_ACTIVE_TERM_OUTPUTS): Likewise.
(FOR_DISABLED_TERM_OUTPUTS): Likewise.
* include/grub/video.h (grub_video_adapter): Move 'next' to first
element.
(grub_video_register): Inline.
(grub_video_unregister): Likewise.
(grub_video_adapter_list): New variable declaration.
(grub_video_iterate): Removed.
(FOR_VIDEO_ADAPTERS): New macro.
* kern/dl.c (grub_dl_list): Removed. All users updated.
(grub_dl_iterate): Removed.
* kern/fs.c (grub_fs_list): Make global.
(grub_fs_register): Removed.
(grub_fs_unregister): Likewise.
(grub_fs_iterate): Likewise.
* kern/handler.c: Removed.
* kern/list.c (grub_list_pop): Removed.
(grub_list_iterate): Likewise.
(grub_list_insert): Likewise.
(grub_named_list_find): Use FOR_LIST_ELEMENTS.
(grub_prio_list_insert): Don't use grub_list_insert.
* kern/main.c (grub_register_rescue_parser): Don't call
grub_register_rescue_parser.
* kern/parser.c (grub_parser_class): Removed.
(grub_parser_execute): Use grub_rescue_parse_line.
* kern/rescue_parser.c (grub_rescue_parse_line): Make global.
(grub_rescue_parser): Removed.
(grub_register_rescue_parser): Likewise.
* kern/rescue_reader.c (grub_rescue_run): Use grub_rescue_parse_line.
* normal/auth.c (is_authenticated): Use FOR_LIST_ELEMENTS.
(grub_auth_check_authentication): Likewise.
* normal/completion.c (iterate_command): Removed.
(grub_normal_do_completion): Use FOR_COMMANDS.
* normal/handler.c: Removed.
* normal/main.c (read_config_file): Remove parser changing.
(grub_normal_execute): Don't call read_handler_list.
(grub_normal_read_line_real): Statically allocate prompt.
(grub_cmdline_run): Use grub_normal_parse_line.
(GRUB_MOD_FINI): Don't call free_handler_list.
* normal/menu_entry.c (run): Likewise.
* script/function.c (grub_script_function_list): Make global.
(grub_script_function_iterate): Removed.
* script/main.c (grub_normal_parse_line): Make global.
(grub_sh_parser): Removed.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* tests/lib/functional_test.c (grub_functional_test): Use
FOR_LIST_ELEMENTS.
* tests/lib/test.c (free_failures): Don't use grub_list_pop.
(grub_test_run): Use FOR_LIST_ELEMENTS.
* tests/lib/unit_test.c (main): Likewise.
* util/deviceiter.c (grub_util_iterate_devices): Don't use
grub_list_pop.
* util/grub-fstest.c (grub_term_input_class): Removed.
(grub_term_output_class): Likewise.
* util/grub-probe.c: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/sparc64/ieee1275/grub-setup.c: Likewise.
* util/grub-script-check.c (main): Don't call grub_init_all and
grub_fini_all.
* video/video.c (grub_video_adapter_list): Make global.
(grub_video_register): Removed.
(grub_video_unregister): Likewise.
(grub_video_iterate): Likewise.
2010-06-11 22:31:16 +02:00
BVK Chaitanya
d2039c36f2
merge with mainline
2010-06-10 21:47:25 +05:30
BVK Chaitanya
25156d7180
pull-in block-arg branch for loop fixes
2010-06-10 20:53:20 +05:30
BVK Chaitanya
a992a71ed8
fix memory issues when used inside loops
2010-06-10 20:49:57 +05:30
BVK Chaitanya
9d0bd7407d
remove menuentry from GRUB script
2010-06-10 18:15:38 +05:30
BVK Chaitanya
db45b311cc
pull-in block-arg branch
2010-06-10 17:57:16 +05:30
BVK Chaitanya
28be0e94db
add example usage to hello command
2010-06-10 12:12:03 +05:30
BVK Chaitanya
3db1c9eee4
pull-in func-params branch
2010-06-09 11:34:01 +05:30
BVK Chaitanya
6c9aa3df16
block params are grub_script with independent memory
2010-06-09 11:29:11 +05:30
Colin Watson
e0f4c43882
* kern/emu/misc.c (device_mapper_null_log): New function.
...
(grub_device_mapper_supported): New function.
* include/grub/emu/misc.h (grub_device_mapper_supported): Add
prototype.
* kern/emu/hostdisk.c (find_partition_start): Check whether
device-mapper is supported before trying to use it.
* util/deviceiter.c (grub_util_iterate_devices): Likewise.
2010-06-07 22:41:55 +01:00
Vladimir 'phcoder' Serbinenko
f5db3949e7
Some hotplug support (buggy)
2010-06-02 21:54:51 +02:00
Vladimir 'phcoder' Serbinenko
440ab68551
Restructure usbms as a preparation for hotplug
2010-06-02 19:52:17 +02:00
Aleš Nesrsta
1515ec8684
2010-06-02 Aleš Nesrsta <starous@volny.cz>
...
Finally make USB usable.
* bus/usb/ohci.c (grub_ohci_reg_t): Add missing values.
(GRUB_OHCI_RHUB_PORT_POWER_MASK): New macro.
(GRUB_OHCI_RHUB_PORT_ALL_POWERED): Likewise.
(GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_MASK): Likewise.
(GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT): Likewise.
(GRUB_OHCI_REG_FRAME_INTERVAL_FI_SHIFT): Likewise.
(GRUB_OHCI_FSMPS): Likewise.
(GRUB_OHCI_PERIODIC_START): Likewise.
(GRUB_OHCI_FRAME_INTERVAL): Likewise.
(GRUB_OHCI_SET_PORT_ENABLE): Likewise.
(GRUB_OHCI_CLEAR_PORT_ENABLE): Likewise.
(GRUB_OHCI_SET_PORT_RESET): Likewise.
(GRUB_OHCI_SET_PORT_RESET_STATUS_CHANGE): Likewise.
* bus/usb/ohci.c (grub_ohci_pci_iter): Various important fixups.
(grub_ohci_transaction): Likewise.
(grub_ohci_transfer): Improve condition detection algorithms.
Handle toggle property. Program the transactions correctly.
Improve error handling. Various important fixups.
(grub_ohci_portstatus): Put register writes in right order.
* bus/usb/uhci.c (grub_free_queue): Compute last_trans.
(grub_uhci_transfer): Don't show "failed" message on success.
* bus/usb/usb.c (grub_usb_set_configuration): Zero-fill whole "toggle"
array.
(grub_usb_device_initialize): Read first 8 bytes of descriptor to
determine its size.
* bus/usb/usbtrans.c (grub_usb_control_msg): Use descdev.maxsize0 even
before initialization is completed. Use IN direction for empty
transfers. Use last_trans and compute toggle.
* include/grub/usbtrans.h (grub_usb_transfer): New field last_trans.
(GRUB_USB_FEATURE_ENDP_HALT): Correct the value.
(GRUB_USB_FEATURE_DEV_REMOTE_WU): Likewise.
(GRUB_USB_FEATURE_TEST_MODE): Likewise.
* include/grub/usb.h (grub_usb_err_t): New value GRUB_USB_ERR_UNRECOVERABLE.
(grub_usb_device): Increase toggle to 256.
(grub_usbms_subclass_t): New values GRUB_USBMS_SUBCLASS_RBC,
GRUB_USBMS_SUBCLASS_MMC2, GRUB_USBMS_SUBCLASS_UFI and
GRUB_USBMS_SUBCLASS_SFF8070.
* include/grub/scsicmd.h (grub_scsi_test_unit_ready): New structure.
(grub_scsi_inquiry): New member page and alloc_length.
(grub_scsi_request_sense): New structure.
(grub_scsi_request_sense_data): Likewise.
(grub_scsi_read_capacity): New fields logical_block_addr, PMI and
control.
* disk/scsi.c (grub_scsi_request_sense): New function.
(grub_scsi_test_unit_ready): Likewise.
(grub_scsi_inquiry): Fill new fields.
(grub_scsi_read_capacity): Likewise.
(grub_scsi_read10): Add request sense at the end.
(grub_scsi_read12): Likewise.
(grub_scsi_write10): Likewise.
(grub_scsi_write12): Likewise.
(grub_scsi_open): Add Test Unit Ready.
* disk/usbms.c (grub_usbms_finddevs): Check configcnt.
Support additional subclasses. Con't clear halt yet. Activate the
proper config. Calculate LUNs correctly.
(grub_usbms_transfer): Various important fixups.
2010-06-02 Vladimir Serbinenko <phcoder@gmail.com>
* bus/pci.c (grub_pci_iterate) [GRUB_MACHINE_MIPS_YEELOONG]: Skip ghosts.
* bus/usb/ohci.c (grub_ohci_portstatus): Handle R/WC correctly.
(grub_ohci_fini_hw): New function.
(grub_ohci_restore_hw): Likewise.
(GRUB_MOD_INIT(ohci)): Register preboot hook.
(GRUB_MOD_FINI(ohci)): Shutdown OHCI.
* term/usb_keyboard.c: Remove include of grub/machine/console.h.
2010-06-02 Vladimir Serbinenko <phcoder@gmail.com>
Dedicated DMA allocations.
* bus/pci.c (grub_memalign_dma32): New function
(grub_dma_free): Likewise.
(grub_dma_get_virt): Likewise.
(grub_dma_get_phys): Likewise.
* bus/usb/ohci.c (grub_ohci): New members hcca_addr and hcca_chunk.
(grub_ohci_pci_iter): Use dma32_alloc.
(grub_ohci_transfer): Likewise.
* bus/usb/usbtrans.c (grub_usb_control_msg): Likewise.
(grub_usb_bulk_readwrite): Likewise.
* include/grub/pci.h: Add declarations.
2010-06-02 Vladimir Serbinenko <phcoder@gmail.com>
CS5536 support.
* bus/cs5536.c: New file.
* bus/usb/ohci.c (grub_ohci_pci_iter): Check for CS5536.
* conf/i386.rmk (pkglib_MODULES): Add cs5536.mod.
(cs5536_mod_SOURCES): New variable.
(cs5536_mod_CFLAGS): Likewise.
(cs5536_mod_LDFLAGS): Likewise.
* conf/mips-yeeloong.rmk (kernel_img_HEADERS): Add cs5536.h and
machine/pci.h.
(kernel_img_SOURCES): Add bus/cs5536.c.
(pkglib_MODULES): Add usb.mod, usbtest.mod, ohci.mod, usbms.mod and
usb_keyboard.mod.
(usb_mod_SOURCES): New variable.
(usb_mod_CFLAGS): New variable.
(usb_mod_LDFLAGS): New variable.
(usbtest_mod_SOURCES): New variable.
(usbtest_mod_CFLAGS): New variable.
(usbtest_mod_LDFLAGS): New variable.
(ohci_mod_SOURCES): New variable.
(ohci_mod_CFLAGS): New variable.
(ohci_mod_LDFLAGS): New variable.
(usbms_mod_SOURCES): New variable.
(usbms_mod_CFLAGS): New variable.
(usbms_mod_LDFLAGS): New variable.
(usb_keyboard_mod_SOURCES): New variable.
(usb_keyboard_mod_CFLAGS): New variable.
(usb_keyboard_mod_LDFLAGS): New variable.
* include/grub/smbus.h: New file.
* include/grub/cs5536.h: New file.
Also-By: Vladimir Serbinenko <phcoder@gmail.com>
2010-06-02 17:16:20 +02:00
Vladimir 'phcoder' Serbinenko
11dccbfd4d
Sort scsi_cmd_t.
2010-06-02 16:45:43 +02:00
Aleš Nesrsta
7d4873c26a
Merge Aleš' latest patch
2010-06-01 02:10:19 +02:00
Jiro SEKIBA
dfbfe00473
* include/grub/disk.h (GRUB_DISK_SIZE_UNKNOWN): New macro.
...
* fs/nilfs.c: Support 2nd super block in case 1st one is accidently
corrupted or not synced properly.
2010-05-31 20:49:42 +02:00
Vladimir 'phcoder' Serbinenko
89d90892d0
Merge usb into yeeloongfw
2010-05-31 14:21:34 +02:00
Aleš Nesrsta
778ff32476
Fix a bunch of problems with USB.
2010-05-31 14:11:41 +02:00
Vladimir 'phcoder' Serbinenko
8b1cf5e87f
Dedicated DMA allocation functions. CS5536 OHCI support.
2010-05-31 13:58:18 +02:00
BVK Chaitanya
fa4b84900a
Fix grub-emu issues on NetBSD, with gcc 4.1.3.
...
* conf/any-emu.rmk: Remove unnecessary COMMON_CFLAGS.
* include/grub/emu/misc.h (canonicalize_file_name): New Prototype.
* kern/misc.c (__enable_execute_stack): Disable on
GRUB_MACHINE_EMU.
2010-05-28 19:18:45 +05:30
Vladimir 'phcoder' Serbinenko
27cd973df6
Macroify command and status registers
2010-05-23 02:41:16 +02:00
Vladimir 'phcoder' Serbinenko
980d936688
Skip ghost USB controllers
2010-05-23 00:12:33 +02:00
Vladimir 'phcoder' Serbinenko
ae87524ea6
Fix getvirt function on yeeloong
2010-05-23 00:11:47 +02:00
Vladimir 'phcoder' Serbinenko
5667f2656d
Add missing part of serial commit
2010-05-23 00:09:39 +02:00
Vladimir 'phcoder' Serbinenko
4b9fa9d70f
Addmissing definitions
2010-05-23 00:08:52 +02:00
Vladimir 'phcoder' Serbinenko
e34b610d49
merge mainline into yeeloongfw
2010-05-22 16:58:45 +02:00
Vladimir 'phcoder' Serbinenko
39fbb79aa1
* include/grub/i18n.h: Always enable grub_gettext.
2010-05-21 20:12:41 +02:00
BVK Chaitanya
5ef88f6e95
merge with mainline
2010-05-20 13:56:14 +05:30
BVK Chaitanya
868bebea0c
merge with mainline
2010-05-19 14:39:58 +05:30
BVK Chaitanya
3ad4f2418d
pull-in func-params branch
2010-05-19 11:01:04 +05:30
BVK Chaitanya
0003008a58
memory leak fix in grub_script_execute_cmdline
2010-05-19 10:25:41 +05:30
BVK Chaitanya
a0b20aad47
some shell expansion features into grub-script
2010-05-18 21:03:35 +05:30
Vladimir 'phcoder' Serbinenko
5779bae94c
merge mainline into newreloc
2010-05-18 14:30:07 +02:00
Vladimir 'phcoder' Serbinenko
95b97950e2
* include/grub/i18n.h (gettext): Inline instead of using #define.
...
(grub_gettext): Likewise.
(_): Likewise.
2010-05-18 14:00:51 +02:00
Vladimir 'phcoder' Serbinenko
13f58ea31f
merge mainline into newreloc
2010-05-18 13:19:42 +02:00
Vladimir 'phcoder' Serbinenko
918405fd8c
merge mainline into rescue-efi
2010-05-17 21:26:16 +02:00
BVK Chaitanya
d2d32327a8
merge with mainline
2010-05-17 20:36:05 +05:30
Vladimir 'phcoder' Serbinenko
967828eb5a
macroify and share VGA registers
2010-05-17 02:25:37 +02:00
Vladimir 'phcoder' Serbinenko
368e544ba6
Add bochs video support
2010-05-17 01:18:50 +02:00
Vladimir 'phcoder' Serbinenko
02aabd9e46
Encapsulate video_fb state in a structure
2010-05-16 15:01:54 +02:00
Vladimir 'phcoder' Serbinenko
26162102fa
Move most framebuffer handling to video_fb.c
2010-05-16 14:40:03 +02:00
Vladimir 'phcoder' Serbinenko
94bf3dd564
somewhat working video_cirrus implementation
2010-05-16 01:32:07 +02:00
Vladimir 'phcoder' Serbinenko
65ce0931d0
Fix inconsistent grub_efiemu_finish_boot_services return type
2010-05-13 14:42:22 +02:00
Vladimir 'phcoder' Serbinenko
cced9145fc
Fix gfxmenu crash.
...
Reported by: Thorsten Grützmacher.
* gfxmenu/gui_circular_progress.c (circprog_destroy): Unregister
timeout hook.
(circprog_set_property): Register and unregister timeout hook.
* gfxmenu/gui_label.c (grub_gui_label): New fields template and value.
(label_destroy): Free template. and unregister hook.
(label_set_state): New function.
(label_set_property): Handle templates and hooks.
* gfxmenu/gui_progress_bar.c (progress_bar_destroy): Unregister
timeout hook.
(progress_bar_set_property): Register and unregister timeout hook.
* gfxmenu/view.c (TIMEOUT_COMPONENT_ID): Move from here ...
* include/grub/gui.h (GRUB_GFXMENU_TIMEOUT_COMPONENT_ID): ...to here
* gfxmenu/view.c (grub_gfxmenu_timeout_notifications): New variable.
(update_timeout_visit): Removed.
(update_timeouts): New function.
(redraw_timeouts): Likewise.
(grub_gfxmenu_print_timeout): Use update_timeouts and redraw_timeouts.
(grub_gfxmenu_clear_timeout): Likewise.
* include/grub/gui.h (grub_gfxmenu_set_state_t): New type.
(grub_gfxmenu_timeout_notify): Likewise.
(grub_gfxmenu_timeout_notifications): New external variable.
(grub_gfxmenu_timeout_register): New function.
(grub_gfxmenu_timeout_unregister): Likewise.
2010-05-13 03:56:14 +02:00
BVK Chaitanya
2e961bd737
pull-in func-params again
2010-05-12 17:59:09 +05:30
BVK Chaitanya
45ab4f486f
pull-in func-params branch
2010-05-12 17:35:07 +05:30
BVK Chaitanya
263b0fa757
merge with mainline
2010-05-12 10:41:24 +05:30
BVK Chaitanya
49b9bacdee
merge with mainline
2010-05-12 10:40:35 +05:30
BVK Chaitanya
a0167e8bdf
rewrote arglist to argv conversion and added $@, $* support
2010-05-12 10:19:12 +05:30
BVK Chaitanya
01b0317f7b
simplified nesting dynamic scopes
2010-05-11 10:52:10 +05:30
Vladimir 'phcoder' Serbinenko
176194068f
cleaner AltGr handling
2010-05-10 21:23:40 +02:00
Vladimir 'phcoder' Serbinenko
1ff38af9b9
Simplify AT keyboards and support 102nd key
2010-05-10 20:57:01 +02:00
Vladimir 'phcoder' Serbinenko
08bfb543c4
Add key_102
2010-05-10 15:04:46 +02:00
Vladimir 'phcoder' Serbinenko
87fae34a1f
Skeleton for keyboard layouts
2010-05-10 14:54:51 +02:00
Vladimir 'phcoder' Serbinenko
232dbbe509
Rename 'VGA' character set to CP-437
2010-05-09 13:26:52 +02:00
Vladimir 'phcoder' Serbinenko
d7fd78dc3d
macroify EFI characters mapping
2010-05-09 13:20:35 +02:00
Vladimir 'phcoder' Serbinenko
b764bff263
Move arrow number into unicode characters array
2010-05-09 12:56:32 +02:00
Vladimir 'phcoder' Serbinenko
7dcef22cd3
merge mainline into bidi
2010-05-09 11:03:03 +02:00
Vladimir 'phcoder' Serbinenko
c6e5caab1d
Transform (broken) vga terminal into (working) vga video driver.
...
* conf/i386-pc.rmk (vga_mod_SOURCES): Change term/i386/pc/vga.c to
video/i386/pc/vga.c.
* include/grub/video.h (grub_video_driver_id):
Add GRUB_VIDEO_DRIVER_VGA.
* term/i386/pc/vga.c: Renamed to ...
* video/i386/pc/vga.c: ...this
(DEBUG_VGA): Removed.
(CHAR_WIDTH): Likewise.
(CHAR_HEIGHT): Likewise.
(TEXT_WIDTH): Likewise.
(TEXT_HEIGHT): Likewise.
(DEFAULT_FG_COLOR): Likewise.
(DEFAULT_BG_COLOR): Likewise.
(colored_char): Likewise.
(xpos): Likewise.
(ypos): Likewise.
(cursor_state): Likewise.
(fg_color): Likewise.
(bg_color): Likewise.
(text_buf): Likewise.
(page): Likewise.
(font): Likewise.
(framebuffer): New variable.
(set_read_map): Disabled.
(setup): New variable.
(is_target): Likewise.
(grub_vga_mod_init): Likewise.
(grub_vga_mod_fini): Likewise.
(check_vga_mem): Likewise.
(write_char): Likewise.
(write_cursor): Likewise.
(scroll_up): Likewise.
(grub_vga_putchar): Likewise.
(grub_vga_getcharwidth): Likewise.
(grub_vga_getwh): Likewise.
(grub_vga_getxy): Likewise.
(grub_vga_gotoxy): Likewise.
(grub_vga_cls): Likewise.
(grub_vga_setcolorstate): Likewise.
(grub_vga_setcursor): Likewise.
(grub_video_vga_init): New function.
(grub_video_vga_setup): Likewise.
(grub_video_vga_fini): Likewise.
(update_target): Likewise.
(grub_video_vga_blit_bitmap): Likewise.
(grub_video_vga_blit_render_target): Likewise.
(grub_video_vga_set_active_render_target): Likewise.
(grub_video_vga_get_active_render_target): Likewise.
(grub_video_vga_swap_buffers): Likewise.
(grub_video_vga_set_palette): Likewise.
(grub_video_vga_get_info_and_fini): Likewise.
(grub_vga_term): Removed.
(grub_video_vga_adapter): New variable.
(GRUB_MOD_INIT): Register a video driver instead of terminal.
(GRUB_MOD_FINI): Unrefister a video driver instead of terminal.
2010-05-09 11:00:21 +02:00
Vladimir 'phcoder' Serbinenko
3c151d94af
simplify setcolor/getcolor
2010-05-08 01:06:22 +02:00
Vladimir 'phcoder' Serbinenko
d8e9099811
Move serial encoding handling to terminfo.c
2010-05-08 00:17:23 +02:00
Vladimir 'phcoder' Serbinenko
bf8733749b
merge common serial and ofconsole code into terminfo
2010-05-07 15:44:43 +02:00
BVK Chaitanya
4a2ec49233
merge with mainline
2010-05-07 11:24:17 +05:30
BVK Chaitanya
e9efa0fe36
shift command support
2010-05-07 10:08:09 +05:30
BVK Chaitanya
7897070571
pulled-in func-params branch
2010-05-07 08:38:08 +05:30
Vladimir 'phcoder' Serbinenko
58664b94b7
pass pointer to term to term functions
2010-05-07 02:30:44 +02:00
Vladimir 'phcoder' Serbinenko
82e32bc310
make serial use ANSI code recognition in terminfo.mod
2010-05-06 21:32:58 +02:00
Vladimir 'phcoder' Serbinenko
e903ddec1c
move ANSI code recognition to terminfo.mod
2010-05-06 21:11:59 +02:00
BVK Chaitanya
f1c891902d
merge with mainline
2010-05-06 21:22:08 +05:30
Vladimir 'phcoder' Serbinenko
42d2c16b39
merge mainline in bidi
2010-05-06 15:18:46 +02:00
BVK Chaitanya
8c41176882
automake commit without merge history
2010-05-06 11:34:04 +05:30
BVK Chaitanya
8f6a910b23
fixed n > active_loops case
2010-05-06 09:55:06 +05:30
BVK Chaitanya
da6e6f17f3
cygwin emu build fixes
2010-05-06 08:45:39 +05:30
Vladimir 'phcoder' Serbinenko
e96ee4339f
merge mainline into newreloc
2010-05-05 21:41:43 +02:00
Vladimir 'phcoder' Serbinenko
7e720a9bc1
* include/grub/ieee1275/ieee1275.h (grub_ieee1275_flag): New value
...
GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM.
* kern/ieee1275/cmain.c (grub_ieee1275_find_options): Set
GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM on qemu.
* kern/ieee1275/init.c (grub_claim_heap): Don0t allocate below
1.5MiB if GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM is set.
2010-05-05 18:52:13 +02:00
Vladimir 'phcoder' Serbinenko
99bfe57386
merge mainline into bidi
2010-05-05 16:28:52 +02:00
BVK Chaitanya
a7aa28248b
break command support
2010-05-05 15:34:26 +05:30
BVK Chaitanya
342bf06e58
function parameters support
2010-05-05 14:47:50 +05:30
Vladimir 'phcoder' Serbinenko
839ced08f5
separate function to allocate DMA memory
2010-05-05 10:40:48 +02:00
BVK Chaitanya
a8a145eb2f
simplify cmdblock with cmdlist
2010-05-05 14:05:06 +05:30
Vladimir 'phcoder' Serbinenko
469ed9410b
Fix i386-pc compilation
2010-05-05 09:58:02 +02:00
Vladimir 'phcoder' Serbinenko
6a82c1b2db
merge mainline into newreloc
2010-05-04 17:35:44 +02:00
Vladimir 'phcoder' Serbinenko
8496927478
move grub_halt out of kernel on most platforms
2010-05-04 17:15:36 +02:00
Vladimir 'phcoder' Serbinenko
4dff488793
merge mainline into intwrap
2010-05-04 15:57:37 +02:00
Vladimir 'phcoder' Serbinenko
41cf1ca332
implement ACPI shutdown
2010-05-04 15:53:21 +02:00
BVK Chaitanya
81827e248c
merge with mainline
2010-05-04 09:09:03 +05:30
Vladimir 'phcoder' Serbinenko
04d050152f
Move geode init to bus/cs5536.c
2010-05-04 00:05:23 +02:00
Vladimir 'phcoder' Serbinenko
05f602fc51
enable xnu on all platforms
2010-05-02 22:06:44 +02:00
Vladimir 'phcoder' Serbinenko
6f030865da
Add missing memory.h
2010-05-02 19:39:35 +02:00
Vladimir 'phcoder' Serbinenko
c5ac9b32ac
Hotkey support
...
* include/grub/menu.h (grub_menu_entry): New field 'hotkey'.
* normal/main.c (hotkey_aliases): New variable.
(grub_normal_add_menu_entry): Parse "--hotkey".
* normal/menu_text.c (run_menu): Handle hotkeys.
2010-05-01 19:33:17 +02:00
Vladimir 'phcoder' Serbinenko
ef4ffedd46
remove loader.h leftovers
2010-05-01 15:15:38 +02:00
Vladimir 'phcoder' Serbinenko
c6fb51295b
merge mainline into newreloc
2010-05-01 15:10:44 +02:00
Vladimir 'phcoder' Serbinenko
7819a4562f
Use LBIO on coreboot.
...
* conf/i386-coreboot.rmk (kernel_img_SOURCES): Change
kern/i386/multiboot_mmap.c to kern/i386/coreboot/mmap.c.
* include/grub/i386/coreboot/memory.h (GRUB_LINUXBIOS_MEMBER_LINK):
New declaration.
* kern/i386/coreboot/init.c (grub_machine_init): Don't call
grub_machine_mmap_init on coreboot.
* kern/i386/coreboot/mmap.c (grub_linuxbios_table_iterate): Handle
GRUB_LINUXBIOS_MEMBER_LINK.
(grub_machine_mmap_iterate): Fix declaration.
* kern/i386/coreboot/startup.S: Don't save mbi location on coreboot.
2010-05-01 14:32:48 +02:00
Vladimir 'phcoder' Serbinenko
7210dca942
Split coreboot and multiboot ports.
...
* conf/i386-multiboot.rmk: New file.
* configure.ac: Add multiboot port.
* include/grub/i386/multiboot/boot.h: New file.
* include/grub/i386/multiboot/console.h: Likewise.
* include/grub/i386/multiboot/init.h: Likewise.
* include/grub/i386/multiboot/kernel.h: Likewise.
* include/grub/i386/multiboot/loader.h: Likewise.
* include/grub/i386/multiboot/memory.h: Likewise.
* include/grub/i386/multiboot/serial.h: Likewise.
* include/grub/i386/multiboot/time.h: Likewise.
* include/grub/multiboot.h: Add GRUB_MACHINE_MULTIBOOT to ifdef.
* loader/multiboot.c: Likewise.
* loader/multiboot_mbi2.c: Likewise.
* util/grub-mkrescue.in: Generate multiboot rescue.
2010-05-01 14:06:53 +02:00
Vladimir 'phcoder' Serbinenko
421e8a5591
Fix ppc compilation problems
2010-05-01 13:23:19 +02:00
BVK Chaitanya
19dd394f56
block argument support
2010-04-30 12:09:31 +05:30
Manoel R. Abranches
8d402bc9a8
small change in the interface structure.
2010-04-29 17:56:09 -03:00
BVK Chaitanya
0993355a68
nested recording support
2010-04-29 18:10:22 +05:30
Vladimir 'phcoder' Serbinenko
ae3c4cd010
Remove loader.h
2010-04-29 13:26:38 +02:00
Manoel R. Abranches
066528b4b1
Initial Implementation of TFTP protocol and new protocol structs.
2010-04-27 18:05:35 -03:00
BVK Chaitanya
f07ccea799
removed some duplicate code
2010-04-27 20:55:12 +05:30
Vladimir 'phcoder' Serbinenko
6c3d9c2845
merge boottest into newreloc
2010-04-27 13:34:07 +02:00
BVK Chaitanya
4c7085f82b
added support for --enable-grub-emu-modules build
2010-04-27 13:57:14 +05:30
BVK Chaitanya
840b61d8f0
reorganized grub-emu sources to suite upcoming automake build system
2010-04-27 10:50:28 +05:30
Vladimir 'phcoder' Serbinenko
8ea6ecb36d
Some cleanups
2010-04-26 21:11:16 +02:00
Vladimir 'phcoder' Serbinenko
debaf23f7c
all images binary identical to the ones from trunk
2010-04-26 19:11:38 +02:00
Vladimir 'phcoder' Serbinenko
bb3208158a
Fill info for remaining platforms. Make efi image identical to image of previous grub-mkimage
2010-04-26 17:19:15 +02:00
Vladimir 'phcoder' Serbinenko
962b15b4c1
Fill info tables for qemu, sparc and mips
2010-04-26 14:42:40 +02:00
Vladimir 'phcoder' Serbinenko
0253aeb7a1
Unified grub-mkimage achieved
2010-04-26 13:11:43 +02:00
Vladimir 'phcoder' Serbinenko
94ac790645
Fix various issues created by previous commits
2010-04-26 10:56:12 +02:00
Christian Franke
460d8402e0
* include/grub/util/getroot.h (grub_get_prefix): Remove prototype.
...
* util/getroot.c [__CYGWIN__] (get_win32_path): Remove function.
(grub_get_prefix): Remove function.
* util/grub-emu.c (main): Replace grub_get_prefix () call by
make_system_path_relative_to_its_root ().
* util/sparc64/ieee1275/grub-setup.c (main): Likewise.
2010-04-26 03:35:55 +02:00
Vladimir 'phcoder' Serbinenko
614be3f119
#if-less grub-mkimage
2010-04-26 00:45:21 +02:00
Vladimir 'phcoder' Serbinenko
2296410ffb
initial support for ppc in grub-mkimage (bugs for now)
2010-04-25 22:26:29 +02:00
Vladimir 'phcoder' Serbinenko
d31bc9964c
migrate kernel.img to elf
2010-04-25 01:54:46 +02:00
Vladimir 'phcoder' Serbinenko
a51df0a1b4
Adjust mips relocator
2010-04-22 02:44:45 +02:00
Vladimir 'phcoder' Serbinenko
4b2ec20b41
Second part of p2v support
2010-04-21 19:13:45 +02:00
Vladimir 'phcoder' Serbinenko
368c17f85d
First part of virtual addr support in relocator
2010-04-21 15:25:49 +02:00
Vladimir 'phcoder' Serbinenko
5490ddc18b
Fix compilation on i386-pc
2010-04-21 10:01:41 +02:00
Vladimir 'phcoder' Serbinenko
6d6f55c557
Use leftovers
2010-04-21 09:27:57 +02:00
Vladimir 'phcoder' Serbinenko
91b58e6b74
EFI requests support for newreloc
2010-04-20 18:08:26 +02:00
BVK Chaitanya
bc4a2d832b
Fix emu build with grub-emu-pci and grub-emu-modules.
...
* include/grub/util/misc.h: Export grub_util_{info,error,warn}
functions.
* include/grub/libpciaccess.h: New file.
* conf/any-emu.rmk: Update kernel headers for emu build.
2010-04-19 16:04:56 +05:30
BVK Chaitanya
454c3001f2
fix emu build with grub-emu-pci and grub-emu-modules
2010-04-19 15:15:59 +05:30
Vladimir 'phcoder' Serbinenko
b076cdc730
Shave off bytes to compensate boot.img size increase
2010-04-18 18:22:58 +02:00
Vladimir 'phcoder' Serbinenko
ee9056d097
Support cross-disk installs. On non-cross-disk retrieve bootpath from chosen/bootpath
2010-04-18 16:35:08 +02:00
Vladimir 'phcoder' Serbinenko
6e86896ed8
Use ofpathname in grub-setup on sparc
2010-04-18 14:02:13 +02:00
Vladimir 'phcoder' Serbinenko
9130433353
Enable USB compilation on Yeeloong
2010-04-16 19:46:22 +02:00
Vladimir 'phcoder' Serbinenko
1c9d6bb81b
Initialise USB option controller
2010-04-16 19:43:52 +02:00
Vladimir 'phcoder' Serbinenko
dae84898b2
Pass %dl to ntldr. Clear other registers.
2010-04-15 02:11:26 +02:00
Vladimir 'phcoder' Serbinenko
298ffd54b0
merge mainline into newreloc
2010-04-11 22:44:31 +02:00
Vladimir 'phcoder' Serbinenko
4b0cd8f813
Fix cygwin compilation.
...
* configure.ac: Define NEED_REGISTER_FRAME_INFO.
* include/grub/misc.h (__register_frame_info)
[NEED_REGISTER_FRAME_INFO && !UTIL]: New export.
(__deregister_frame_info) [NEED_REGISTER_FRAME_INFO && !UTIL]: Likewise.
* kern/misc.c (__register_frame_info)
[NEED_REGISTER_FRAME_INFO && !UTIL]: New empty function.
(__deregister_frame_info) [NEED_REGISTER_FRAME_INFO && !UTIL]: Likewise.
2010-04-11 21:24:21 +02:00
Vladimir 'phcoder' Serbinenko
5d04b11e0e
Unify libgcc processing.
...
* Makefile.in (kernel_img_LDFLAGS): New variable.
* conf/common.rmk (kernel_img_HEADERS): Add libgcc.h.
* conf/i386-coreboot.rmk (kernel_img_LDFLAGS): Append instead of
overwriting.
* conf/i386-ieee1275.rmk (kernel_img_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_LDFLAGS): Likewise.
* conf/i386-qemu.rmk (kernel_img_LDFLAGS): Likewise.
* conf/x86-efi.rmk (kernel_img_LDFLAGS): Likewise.
* conf/mips-qemu-mips.rmk (kernel_img_LDFLAGS): Append instead of
overwriting. Remove -lgcc and -static-libgcc
* conf/mips-yeeloong.rmk (kernel_img_LDFLAGS): Likewise.
* conf/mips.rmk (kernel_img_HEADERS): Remove cpu/libgcc.h
* conf/powerpc-ieee1275.rmk (kernel_img_HEADERS): Remove cpu/libgcc.h
(kernel_img_LDFLAGS): Append instead of overwriting.
Remove -lgcc and -static-libgcc
* conf/sparc64-ieee1275.rmk: Likewise.
* include/grub/powerpc/libgcc.h: Move to ...
* include/grub/libgcc.h: .. this.
* include/grub/libgcc.h: Don't export most of the function on x86.
(__bswapsi2): New export.
(__bswapdi2): Likewise.
* include/grub/mips/libgcc.h: Removed.
* include/grub/sparc64/libgcc.h: Likewise.
2010-04-11 01:14:31 +02:00
Vladimir 'phcoder' Serbinenko
8c5ed46e48
Inline grub_stop_floppy
2010-04-10 19:59:22 +02:00
Vladimir 'phcoder' Serbinenko
d2e5601745
Merge mainline into intwrap
2010-04-10 19:29:40 +02:00
Vladimir 'phcoder' Serbinenko
f632937ab5
intwrap grub_get_mmap_entry
2010-04-10 19:12:04 +02:00
Vladimir 'phcoder' Serbinenko
0d06476b05
intwrap get_eisa_map. Fix intwrapping of get_ext_memsize.
2010-04-10 14:45:27 +02:00
Vladimir 'phcoder' Serbinenko
c663074e6d
intwrap get_memsize
2010-04-10 14:35:26 +02:00
Vladimir 'phcoder' Serbinenko
6734334a53
* include/grub/util/misc.h (canonicalise_file_name): Add missing
...
prototype.
Reported by: Seth Goldberg.
2010-04-10 12:46:12 +02:00
Vladimir 'phcoder' Serbinenko
f2fd9d2b2b
* include/grub/efi/memory.h (grub_machine_mmap_iterate): Remove
...
EXPORT_FUNC.
Reported by: Seth Goldberg.
2010-04-10 02:45:26 +02:00
Vladimir 'phcoder' Serbinenko
b3d0fa12af
Fix usb support
2010-04-10 01:56:51 +02:00
Vladimir 'phcoder' Serbinenko
a29e902132
Merge mainline into emu-modload
2010-04-10 01:25:46 +02:00
Vladimir 'phcoder' Serbinenko
787928e31e
Remove newline_hook declaration
2010-04-09 23:15:33 +02:00
Vladimir 'phcoder' Serbinenko
4a55d631d7
Merge mainline into for_macros
2010-04-09 22:35:32 +02:00
Vladimir 'phcoder' Serbinenko
027de555e2
* normal/autofs.c (read_fs_list): New parameter 'prefix'.
...
All users updated.
* normal/crypto.c (read_crypto_list): Likewise.
* normal/dyncmd.c (read_command_list): Likewise.
* normal/term.c (read_terminal_list): Likewise.
* normal/main.c (read_lists): Use explicit prefix.
(read_lists_hook): Use read_lists.
(grub_normal_execute): Likewise.
2010-04-09 21:07:24 +02:00
Vladimir 'phcoder' Serbinenko
a87add6d17
merge mainline into bidi
2010-04-09 19:40:31 +02:00
Vladimir 'phcoder' Serbinenko
9e71201f48
merge mainline into bidi
2010-04-09 19:31:43 +02:00
BVK Chaitanya
c41c00eab6
merged with mainline
2010-04-09 21:44:59 +05:30
Vladimir 'phcoder' Serbinenko
3bf09c9ea8
rename format from raw to yeeloong_flash
2010-04-06 22:23:02 +02:00
Vladimir 'phcoder' Serbinenko
781d7798bb
Fix interrupt and windows problems
2010-04-06 22:12:04 +02:00
Vladimir 'phcoder' Serbinenko
f9e7780cff
Fix an early timer-related hang
2010-04-06 02:40:44 +02:00
Vladimir 'phcoder' Serbinenko
04a3792f87
Macroify fwstart.S more
2010-04-05 22:39:58 +02:00
Vladimir 'phcoder' Serbinenko
a6132b9f3f
Merge mainline into yeeloongfw
2010-04-05 17:35:03 +02:00
Vladimir 'phcoder' Serbinenko
064cb524ec
* include/grub/i386/pc/init.h (grub_get_mmap_entry): Don't export.
...
* conf/i386-pc.rmk (kernel_img_HEADERS): Remove machine/init.h.
2010-04-05 15:57:40 +02:00
Vladimir 'phcoder' Serbinenko
77356db852
Intwrapped biosdisk
2010-04-04 18:43:26 +02:00
Vladimir 'phcoder' Serbinenko
42c4f00016
intwrapped halt
2010-04-04 18:42:48 +02:00
Vladimir 'phcoder' Serbinenko
1b8cb8573b
intwrap grub_pxe_scan
2010-04-04 15:49:06 +02:00
Vladimir 'phcoder' Serbinenko
65936631e4
intwrap vbe and vga calls
2010-04-04 14:24:50 +02:00
Vladimir 'phcoder' Serbinenko
56912f57b6
Merge mainline into intwrap
2010-04-04 14:14:50 +02:00
Vladimir 'phcoder' Serbinenko
a8c3b552a7
Remove unused grub_vga_get_font.
...
* kern/i386/pc/startup.S (grub_vga_get_font): Removed.
* include/grub/i386/pc/vga.h (grub_vga_get_font): Likewise.
2010-04-04 14:12:11 +02:00
Grégoire Sutre
187bbe3d9c
* kern/misc.c: Disable the __enable_execute_stack hack for utilities.
...
* include/grub/misc.h: Likewise.
2010-04-03 21:00:21 +02:00
Vladimir 'phcoder' Serbinenko
f0847685dd
Merge mainline into newreloc
2010-04-03 17:47:59 +02:00
Vladimir 'phcoder' Serbinenko
8c46a785e3
mips multiboot2 support
2010-04-03 14:14:48 +02:00
Vladimir 'phcoder' Serbinenko
a60f822cb2
Add missing id field to grub_video_sm712_adapter
2010-04-03 14:12:43 +02:00
Vladimir 'phcoder' Serbinenko
3a5768645c
First version of allocation from firmware
2010-04-03 11:53:29 +02:00
Vladimir 'phcoder' Serbinenko
8b0800f66f
merge mainline into newreloc
2010-04-01 22:17:26 +02:00
Vladimir 'phcoder' Serbinenko
f651947b58
Merge mainline into bidi
2010-03-30 11:24:28 +02:00
Vladimir 'phcoder' Serbinenko
483c5e7d47
Transform remarkable unicode codepoints into enum
2010-03-29 13:36:08 +02:00
Vladimir 'phcoder' Serbinenko
0546172e3e
Basic thaana support
2010-03-29 13:31:03 +02:00
Vladimir 'phcoder' Serbinenko
e2588ccbfe
Alif and alaph superscripts
2010-03-29 13:01:08 +02:00
Vladimir 'phcoder' Serbinenko
ad109fe056
Arabic diacritics support
2010-03-29 04:11:14 +02:00
Vladimir 'phcoder' Serbinenko
a82890fffc
Shape arabic code when on UTF-8 visual
2010-03-29 03:37:24 +02:00