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
12cd7239d9
Faster OHCI, USB hub support, UHCI portstatus corr.
2010-06-21 21:12:20 +02:00
8e50ec9f05
Merge mainline into cirrus
2010-06-21 02:15:49 +02:00
de24ab9b0d
Fix grub_vga_palette_write
2010-06-21 02:07:45 +02:00
4d88b9aec7
Init cirrus ourselves instead of calling videobios
2010-06-21 01:02:48 +02:00
8c0346515d
Add GRUB_PCI_REG_STATUS_*_ENABLE
2010-06-21 01:01:26 +02:00
d246fc0368
Improve macroification of VGA registers.
2010-06-21 00:58:43 +02:00
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
2e1310bc7c
merge with mainline
2010-06-13 10:22:38 +05:30
eedda76883
merge with mainline
2010-06-13 09:58:24 +05:30
49e38cf475
merge with mainline
2010-06-13 09:48:47 +05:30
d49703d151
Add priorities support
2010-06-12 17:38:48 +02:00
20ebf73276
merge with mainline
2010-06-12 20:36:46 +05:30
9038c767e3
merge mainline
2010-06-12 15:01:46 +01:00
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
1c8f0f8d11
* include/grub/types.h: Check for GRUB_CPU_SIZEOF_LONG when appropriate.
2010-06-12 14:50:07 +02:00
934302d00b
merge mainline
2010-06-12 12:17:28 +01:00
95af254928
merge with mainline
2010-06-12 16:32:06 +05:30
8253ee6bd7
merge mainline up to r2075 (videomask merge)
2010-06-12 11:30:11 +01:00
b2d0e6c3fd
merge with mainline
2010-06-12 13:55:31 +05:30
b06f83e3ba
a better fix
2010-06-12 11:06:02 +05:30
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
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
d2039c36f2
merge with mainline
2010-06-10 21:47:25 +05:30
25156d7180
pull-in block-arg branch for loop fixes
2010-06-10 20:53:20 +05:30
a992a71ed8
fix memory issues when used inside loops
2010-06-10 20:49:57 +05:30
9d0bd7407d
remove menuentry from GRUB script
2010-06-10 18:15:38 +05:30
db45b311cc
pull-in block-arg branch
2010-06-10 17:57:16 +05:30
28be0e94db
add example usage to hello command
2010-06-10 12:12:03 +05:30
3db1c9eee4
pull-in func-params branch
2010-06-09 11:34:01 +05:30
6c9aa3df16
block params are grub_script with independent memory
2010-06-09 11:29:11 +05:30
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
f5db3949e7
Some hotplug support (buggy)
2010-06-02 21:54:51 +02:00
440ab68551
Restructure usbms as a preparation for hotplug
2010-06-02 19:52:17 +02:00
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
11dccbfd4d
Sort scsi_cmd_t.
2010-06-02 16:45:43 +02:00
7d4873c26a
Merge Aleš' latest patch
2010-06-01 02:10:19 +02:00
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
89d90892d0
Merge usb into yeeloongfw
2010-05-31 14:21:34 +02:00
778ff32476
Fix a bunch of problems with USB.
2010-05-31 14:11:41 +02:00
8b1cf5e87f
Dedicated DMA allocation functions. CS5536 OHCI support.
2010-05-31 13:58:18 +02:00
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
27cd973df6
Macroify command and status registers
2010-05-23 02:41:16 +02:00
980d936688
Skip ghost USB controllers
2010-05-23 00:12:33 +02:00
ae87524ea6
Fix getvirt function on yeeloong
2010-05-23 00:11:47 +02:00
5667f2656d
Add missing part of serial commit
2010-05-23 00:09:39 +02:00
4b9fa9d70f
Addmissing definitions
2010-05-23 00:08:52 +02:00
e34b610d49
merge mainline into yeeloongfw
2010-05-22 16:58:45 +02:00
39fbb79aa1
* include/grub/i18n.h: Always enable grub_gettext.
2010-05-21 20:12:41 +02:00
5ef88f6e95
merge with mainline
2010-05-20 13:56:14 +05:30
868bebea0c
merge with mainline
2010-05-19 14:39:58 +05:30
3ad4f2418d
pull-in func-params branch
2010-05-19 11:01:04 +05:30
0003008a58
memory leak fix in grub_script_execute_cmdline
2010-05-19 10:25:41 +05:30
a0b20aad47
some shell expansion features into grub-script
2010-05-18 21:03:35 +05:30
5779bae94c
merge mainline into newreloc
2010-05-18 14:30:07 +02:00
95b97950e2
* include/grub/i18n.h (gettext): Inline instead of using #define.
...
(grub_gettext): Likewise.
(_): Likewise.
2010-05-18 14:00:51 +02:00
13f58ea31f
merge mainline into newreloc
2010-05-18 13:19:42 +02:00
918405fd8c
merge mainline into rescue-efi
2010-05-17 21:26:16 +02:00
d2d32327a8
merge with mainline
2010-05-17 20:36:05 +05:30
967828eb5a
macroify and share VGA registers
2010-05-17 02:25:37 +02:00
368e544ba6
Add bochs video support
2010-05-17 01:18:50 +02:00
02aabd9e46
Encapsulate video_fb state in a structure
2010-05-16 15:01:54 +02:00
26162102fa
Move most framebuffer handling to video_fb.c
2010-05-16 14:40:03 +02:00
94bf3dd564
somewhat working video_cirrus implementation
2010-05-16 01:32:07 +02:00
65ce0931d0
Fix inconsistent grub_efiemu_finish_boot_services return type
2010-05-13 14:42:22 +02:00
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
2e961bd737
pull-in func-params again
2010-05-12 17:59:09 +05:30
45ab4f486f
pull-in func-params branch
2010-05-12 17:35:07 +05:30
263b0fa757
merge with mainline
2010-05-12 10:41:24 +05:30
49b9bacdee
merge with mainline
2010-05-12 10:40:35 +05:30
a0167e8bdf
rewrote arglist to argv conversion and added $@, $* support
2010-05-12 10:19:12 +05:30
01b0317f7b
simplified nesting dynamic scopes
2010-05-11 10:52:10 +05:30
176194068f
cleaner AltGr handling
2010-05-10 21:23:40 +02:00
1ff38af9b9
Simplify AT keyboards and support 102nd key
2010-05-10 20:57:01 +02:00
08bfb543c4
Add key_102
2010-05-10 15:04:46 +02:00
87fae34a1f
Skeleton for keyboard layouts
2010-05-10 14:54:51 +02:00
232dbbe509
Rename 'VGA' character set to CP-437
2010-05-09 13:26:52 +02:00
d7fd78dc3d
macroify EFI characters mapping
2010-05-09 13:20:35 +02:00
b764bff263
Move arrow number into unicode characters array
2010-05-09 12:56:32 +02:00
7dcef22cd3
merge mainline into bidi
2010-05-09 11:03:03 +02:00
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
3c151d94af
simplify setcolor/getcolor
2010-05-08 01:06:22 +02:00
d8e9099811
Move serial encoding handling to terminfo.c
2010-05-08 00:17:23 +02:00
bf8733749b
merge common serial and ofconsole code into terminfo
2010-05-07 15:44:43 +02:00
4a2ec49233
merge with mainline
2010-05-07 11:24:17 +05:30
e9efa0fe36
shift command support
2010-05-07 10:08:09 +05:30
7897070571
pulled-in func-params branch
2010-05-07 08:38:08 +05:30
58664b94b7
pass pointer to term to term functions
2010-05-07 02:30:44 +02:00
82e32bc310
make serial use ANSI code recognition in terminfo.mod
2010-05-06 21:32:58 +02:00
e903ddec1c
move ANSI code recognition to terminfo.mod
2010-05-06 21:11:59 +02:00
f1c891902d
merge with mainline
2010-05-06 21:22:08 +05:30
42d2c16b39
merge mainline in bidi
2010-05-06 15:18:46 +02:00
8c41176882
automake commit without merge history
2010-05-06 11:34:04 +05:30
8f6a910b23
fixed n > active_loops case
2010-05-06 09:55:06 +05:30
da6e6f17f3
cygwin emu build fixes
2010-05-06 08:45:39 +05:30
e96ee4339f
merge mainline into newreloc
2010-05-05 21:41:43 +02:00
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
99bfe57386
merge mainline into bidi
2010-05-05 16:28:52 +02:00
a7aa28248b
break command support
2010-05-05 15:34:26 +05:30
342bf06e58
function parameters support
2010-05-05 14:47:50 +05:30
839ced08f5
separate function to allocate DMA memory
2010-05-05 10:40:48 +02:00
a8a145eb2f
simplify cmdblock with cmdlist
2010-05-05 14:05:06 +05:30
469ed9410b
Fix i386-pc compilation
2010-05-05 09:58:02 +02:00
6a82c1b2db
merge mainline into newreloc
2010-05-04 17:35:44 +02:00
8496927478
move grub_halt out of kernel on most platforms
2010-05-04 17:15:36 +02:00
4dff488793
merge mainline into intwrap
2010-05-04 15:57:37 +02:00
41cf1ca332
implement ACPI shutdown
2010-05-04 15:53:21 +02:00
81827e248c
merge with mainline
2010-05-04 09:09:03 +05:30
04d050152f
Move geode init to bus/cs5536.c
2010-05-04 00:05:23 +02:00
05f602fc51
enable xnu on all platforms
2010-05-02 22:06:44 +02:00
6f030865da
Add missing memory.h
2010-05-02 19:39:35 +02:00
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
ef4ffedd46
remove loader.h leftovers
2010-05-01 15:15:38 +02:00
c6fb51295b
merge mainline into newreloc
2010-05-01 15:10:44 +02:00
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
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
421e8a5591
Fix ppc compilation problems
2010-05-01 13:23:19 +02:00
19dd394f56
block argument support
2010-04-30 12:09:31 +05:30
8d402bc9a8
small change in the interface structure.
2010-04-29 17:56:09 -03:00
0993355a68
nested recording support
2010-04-29 18:10:22 +05:30
ae3c4cd010
Remove loader.h
2010-04-29 13:26:38 +02:00
066528b4b1
Initial Implementation of TFTP protocol and new protocol structs.
2010-04-27 18:05:35 -03:00
f07ccea799
removed some duplicate code
2010-04-27 20:55:12 +05:30
6c3d9c2845
merge boottest into newreloc
2010-04-27 13:34:07 +02:00
4c7085f82b
added support for --enable-grub-emu-modules build
2010-04-27 13:57:14 +05:30
840b61d8f0
reorganized grub-emu sources to suite upcoming automake build system
2010-04-27 10:50:28 +05:30
8ea6ecb36d
Some cleanups
2010-04-26 21:11:16 +02:00
debaf23f7c
all images binary identical to the ones from trunk
2010-04-26 19:11:38 +02:00
bb3208158a
Fill info for remaining platforms. Make efi image identical to image of previous grub-mkimage
2010-04-26 17:19:15 +02:00
962b15b4c1
Fill info tables for qemu, sparc and mips
2010-04-26 14:42:40 +02:00
0253aeb7a1
Unified grub-mkimage achieved
2010-04-26 13:11:43 +02:00
94ac790645
Fix various issues created by previous commits
2010-04-26 10:56:12 +02:00
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
614be3f119
#if-less grub-mkimage
2010-04-26 00:45:21 +02:00
2296410ffb
initial support for ppc in grub-mkimage (bugs for now)
2010-04-25 22:26:29 +02:00
d31bc9964c
migrate kernel.img to elf
2010-04-25 01:54:46 +02:00
a51df0a1b4
Adjust mips relocator
2010-04-22 02:44:45 +02:00
4b2ec20b41
Second part of p2v support
2010-04-21 19:13:45 +02:00
368c17f85d
First part of virtual addr support in relocator
2010-04-21 15:25:49 +02:00
5490ddc18b
Fix compilation on i386-pc
2010-04-21 10:01:41 +02:00
6d6f55c557
Use leftovers
2010-04-21 09:27:57 +02:00
91b58e6b74
EFI requests support for newreloc
2010-04-20 18:08:26 +02:00
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
454c3001f2
fix emu build with grub-emu-pci and grub-emu-modules
2010-04-19 15:15:59 +05:30
b076cdc730
Shave off bytes to compensate boot.img size increase
2010-04-18 18:22:58 +02:00
ee9056d097
Support cross-disk installs. On non-cross-disk retrieve bootpath from chosen/bootpath
2010-04-18 16:35:08 +02:00
6e86896ed8
Use ofpathname in grub-setup on sparc
2010-04-18 14:02:13 +02:00
9130433353
Enable USB compilation on Yeeloong
2010-04-16 19:46:22 +02:00
1c9d6bb81b
Initialise USB option controller
2010-04-16 19:43:52 +02:00
dae84898b2
Pass %dl to ntldr. Clear other registers.
2010-04-15 02:11:26 +02:00
298ffd54b0
merge mainline into newreloc
2010-04-11 22:44:31 +02:00
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
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
8c5ed46e48
Inline grub_stop_floppy
2010-04-10 19:59:22 +02:00
d2e5601745
Merge mainline into intwrap
2010-04-10 19:29:40 +02:00
f632937ab5
intwrap grub_get_mmap_entry
2010-04-10 19:12:04 +02:00
0d06476b05
intwrap get_eisa_map. Fix intwrapping of get_ext_memsize.
2010-04-10 14:45:27 +02:00
c663074e6d
intwrap get_memsize
2010-04-10 14:35:26 +02:00
6734334a53
* include/grub/util/misc.h (canonicalise_file_name): Add missing
...
prototype.
Reported by: Seth Goldberg.
2010-04-10 12:46:12 +02:00
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
b3d0fa12af
Fix usb support
2010-04-10 01:56:51 +02:00
a29e902132
Merge mainline into emu-modload
2010-04-10 01:25:46 +02:00
787928e31e
Remove newline_hook declaration
2010-04-09 23:15:33 +02:00
4a55d631d7
Merge mainline into for_macros
2010-04-09 22:35:32 +02:00
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
a87add6d17
merge mainline into bidi
2010-04-09 19:40:31 +02:00
9e71201f48
merge mainline into bidi
2010-04-09 19:31:43 +02:00
c41c00eab6
merged with mainline
2010-04-09 21:44:59 +05:30
3bf09c9ea8
rename format from raw to yeeloong_flash
2010-04-06 22:23:02 +02:00
781d7798bb
Fix interrupt and windows problems
2010-04-06 22:12:04 +02:00
f9e7780cff
Fix an early timer-related hang
2010-04-06 02:40:44 +02:00
04a3792f87
Macroify fwstart.S more
2010-04-05 22:39:58 +02:00
a6132b9f3f
Merge mainline into yeeloongfw
2010-04-05 17:35:03 +02:00
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
77356db852
Intwrapped biosdisk
2010-04-04 18:43:26 +02:00
42c4f00016
intwrapped halt
2010-04-04 18:42:48 +02:00
1b8cb8573b
intwrap grub_pxe_scan
2010-04-04 15:49:06 +02:00
65936631e4
intwrap vbe and vga calls
2010-04-04 14:24:50 +02:00
56912f57b6
Merge mainline into intwrap
2010-04-04 14:14:50 +02:00
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
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
f0847685dd
Merge mainline into newreloc
2010-04-03 17:47:59 +02:00
8c46a785e3
mips multiboot2 support
2010-04-03 14:14:48 +02:00
a60f822cb2
Add missing id field to grub_video_sm712_adapter
2010-04-03 14:12:43 +02:00
3a5768645c
First version of allocation from firmware
2010-04-03 11:53:29 +02:00
8b0800f66f
merge mainline into newreloc
2010-04-01 22:17:26 +02:00
f651947b58
Merge mainline into bidi
2010-03-30 11:24:28 +02:00
483c5e7d47
Transform remarkable unicode codepoints into enum
2010-03-29 13:36:08 +02:00
0546172e3e
Basic thaana support
2010-03-29 13:31:03 +02:00
e2588ccbfe
Alif and alaph superscripts
2010-03-29 13:01:08 +02:00
ad109fe056
Arabic diacritics support
2010-03-29 04:11:14 +02:00
a82890fffc
Shape arabic code when on UTF-8 visual
2010-03-29 03:37:24 +02:00
3f11c7131e
Generate shaping table based on unicode if source font has none
2010-03-29 02:06:40 +02:00
016883a55c
* include/multiboot2.h: Resync with spec.
2010-03-28 14:19:41 +02:00
f5d5c327e3
Remove VBE multiboot support
2010-03-28 13:46:42 +02:00
df32be8cc1
Merge mainline into mbtag
2010-03-27 22:14:41 +01:00
46960ff9ec
Resynced with multiboot2 spec
2010-03-27 21:50:57 +01:00
394a3120a7
Fix a build failure (-Wundef -Werror) when ENABLE_NLS is not defined,
...
which is the case with --disabled-nls.
* include/grub/i18n.h: Use (defined(ENABLE_NLS)
&& ENABLE_NLS) instead of ENABLE_NLS in all #if preprocessor macros.
* util/misc.c: Likewise.
* util/mkisofs/mkisofs.c: Likewise.
* util/mkisofs/mkisofs.h: Likewise.
2010-03-27 12:19:32 +01:00
9cc7b8751e
Remove grub_script_function_iterate
2010-03-27 00:58:35 +01:00
fcaae9ec12
Remove grub_dl_iterate
2010-03-27 00:52:40 +01:00
9eade9dbd7
Remove grub_video_iterate
2010-03-27 00:36:28 +01:00
c96db58ec5
Remove grub_fs_iterate
2010-03-27 00:27:42 +01:00
d56a6ac7f6
Remove handlers
2010-03-27 00:19:42 +01:00
0959e5ec30
Remove grub_list_pop
2010-03-26 20:20:52 +01:00
8cfa78770d
cleanup list.h a bit
2010-03-26 20:05:25 +01:00
82f542016e
Eradicate grub_list_insert
2010-03-26 20:00:06 +01:00
fda282327f
Complete eradication of grub_list_iterate
2010-03-26 19:44:18 +01:00
3f8ae91c09
Use FOR_LIST_ELEMENTS convenience macros
2010-03-26 19:32:21 +01:00
42ca71ca47
FOR_LIST_ELEMENTS convenience macros
2010-03-26 19:25:53 +01:00
d85da27cc0
Remove grub_commands_iterate
2010-03-26 19:14:24 +01:00
0790690196
merge mainline into grub-file
2010-03-26 17:06:36 +01:00
baae00df35
merged with mainline
2010-03-26 21:13:06 +05:30
c299f3d6fb
merged with mainline
2010-03-26 20:55:07 +05:30
c9ea504d25
merge mainline into nestpart
2010-03-26 15:44:13 +01:00
e6d428c1b8
Arabic shaping support
2010-03-24 22:33:00 +01:00
03e4ef0293
Import data for arabic joining computation
2010-03-24 00:35:38 +01:00
832d13705c
Most hebrew diacritics support (except dagesh and final kaf rules)
2010-03-23 21:50:27 +01:00
7624beba47
Above left support. Various fixups
2010-03-23 19:13:46 +01:00
45511ee976
below right support
2010-03-23 18:39:02 +01:00
1f22d20c8c
Fix yeeloong compilation
2010-03-23 18:17:54 +01:00
5c56cac95f
Fix few pager bugs
2010-03-23 18:06:49 +01:00
3c69fb81e1
Restore and enhance pager functionality
2010-03-23 17:54:31 +01:00
6fcebedeed
Replace line counter with char counter
2010-03-23 16:51:53 +01:00
dd6fee39fa
merged mainline
2010-03-21 11:03:41 +05:30
09f9aa3b2e
Move terminal-related function from normal/charset.c to normal/term.c
2010-03-17 08:57:23 +01:00
34fac099a5
Make grub_console_real_putchar grub_console_putchar
2010-03-17 08:37:48 +01:00
eaa1f9a64b
Fix few memory errors
2010-03-16 23:03:08 +01:00
6f5568ed67
Add mirroring for visual UTF-8
2010-03-16 21:57:34 +01:00
6c363dfd54
Fix doublewidth character handling
2010-03-16 21:29:15 +01:00
50186d826d
Fix combining characters messing with width counter
2010-03-16 19:55:09 +01:00
bf17ef45d6
Rename UCS4 to glyph description
2010-03-16 19:23:21 +01:00
f588f1c8b6
Add simple line wrapping
2010-03-16 14:13:32 +01:00
8a99e92a69
merge in mainline
2010-03-16 17:42:27 +05:30
97b3fbb872
Handle initial position in bidi
2010-03-16 10:55:06 +01:00
05c15154a2
Visual(sic) UTF-8 support
2010-03-16 10:39:18 +01:00
f10331edf2
Preliminary support for UTF-8 console
2010-03-16 00:48:34 +01:00
53c648d2eb
Break few dependencies on normal
2010-03-15 22:12:34 +01:00
0a239a8211
bidi works in terminal in grub-emu
2010-03-15 21:14:11 +01:00
dfed5c6bb4
Removed grub_putchar
2010-03-15 11:49:27 +01:00
53f312c1cf
Merge mainline into bidi
2010-03-15 10:28:09 +01:00
8622549153
merged in mainline
2010-03-14 22:20:55 +05:30
016a671b51
Merge mainline into cleanbuild
2010-03-14 16:01:31 +01:00
9a1e70432b
Merge mainline into ofwfb
2010-03-14 15:43:22 +01:00
5dbb0fc055
Another round of macrofication
2010-03-12 14:08:26 +01:00
f9ef05770a
Shutdown and reboot on yeeloong
2010-03-12 14:07:33 +01:00
d0c7485824
Macroify serial and PCI constants
2010-03-11 15:21:06 +01:00
edf717f5cb
Macroify CP0 registers
2010-03-11 13:59:56 +01:00
21eecb8e83
Set ROM delay to 1
2010-03-11 03:21:10 +01:00
bf8b8ab725
Enable caches on yeeloong
2010-03-11 02:47:08 +01:00
c3a8dfc8b7
Tagged header support
2010-03-10 11:40:20 +01:00
b1f6f35ae9
Preparation for mbh tag
2010-03-08 15:40:57 +01:00
c28e2d120b
merge mainline into yeeloongfw
2010-03-07 23:21:09 +01:00
8eb567e662
Update with newest mbtag spec
2010-03-07 14:59:15 +01:00
3f5a90c616
merge mainline into mbtag
2010-03-07 13:01:43 +01:00
1bf0e31cfb
Network infrastructure
2010-03-03 20:09:48 +01:00
4931b0984b
Network infrastructure
2010-03-03 20:09:48 +01:00
14532662ee
merge mainline into sparc-mkimage
2010-03-03 11:24:36 +01:00
c6f2fe52f1
2010-03-01 Vladimir Serbinenko <phcoder@gmail.com>
...
Wait for user entry basing on presence of output rather than on errors.
* include/grub/normal.h (grub_normal_get_line_counter): New proto.
(grub_install_newline_hook): Likewise.
* normal/main.c (GRUB_MOD_INIT): Call grub_install_newline_hook.
* normal/menu.c (show_menu): Check line_counter to determine presence
of output.
* normal/term.c (grub_normal_line_counter): New variable.
(grub_normal_get_line_counter): New function.
(grub_install_newline_hook): Likewise.
2010-03-01 20:58:45 +01:00
813a5f2d33
Init DDR2 controller
2010-03-01 18:53:34 +01:00
c140a18037
2010-02-25 Vladimir Serbinenko <phcoder@gmail.com>
...
Don't compile video modules on yeeloong since video subsystem is part
of kernel.
* conf/common.rmk (pkglib_MODULES) [yeeloong]: Remove video.mod,
video_fb.mod, bitmap.mod, font.mod, gfxterm.mod and bufio.mod
* conf/mips-yeeloong.rmk (kernel_img_HEADERS): Add bitmap.h,
video.h, gfxterm.h, font.h, bitmap_scale.h and bufio.h.
* conf/mips.rmk (kernel_img_HEADERS): Add values instead of overwriting.
* include/grub/bitmap.h: Add EXPORT_FUNC and EXPORT_VAR.
* include/grub/bitmap_scale.h: Likewise.
* include/grub/bufio.h: Likewise.
* include/grub/font.h: Likewise.
* include/grub/gfxterm.h: Likewise.
* include/grub/video.h: Likewise.
* include/grub/vbe.h: Don't include video_fb.h.
* video/i386/pc/vbe.c: Include video_fb.h.
* commands/i386/pc/vbetest.c: Include video.h.
2010-02-25 15:10:18 +01:00
7517048135
Working SPD reading in fwstart.img
2010-02-17 21:10:58 +01:00
a1efcc79d3
Firmware startup block (for now just output a string on console)
2010-02-16 22:41:29 +01:00
1eb746f274
Initialise remaining UART registers on Yeeloong
2010-02-16 22:40:53 +01:00
232f7e29c9
SMBus on CS5536 support
2010-02-16 22:39:59 +01:00
320dd174b5
Increase stack size on sparc
2010-02-14 14:32:21 +01:00
10f6389453
Fix raw image addresses
2010-02-13 18:48:33 +01:00
0b4ab8e54a
Merge mainline int sparc-mkimage-unify
2010-02-13 16:49:21 +01:00
904935c3ef
2010-02-13 Vladimir Serbinenko <phcoder@gmail.com>
...
Merge grub_ieee1275_map_physical into grub_map and rename to
grub_ieee1275_map
* include/grub/ieee1275/ieee1275.h (grub_ieee1275_map): New proto.
* include/grub/sparc64/ieee1275/ieee1275.h (grub_ieee1275_map_physical):
Remove.
* kern/ieee1275/openfw.c (grub_map): Rename to ...
(grub_ieee1275_map): ... this. All users updated. Add phys_lo when
necessary.
* kern/sparc64/ieee1275/ieee1275.c (grub_ieee1275_map_physical): Remove.
2010-02-13 16:48:22 +01:00
a49217cff7
aout image support
2010-02-13 16:26:50 +01:00
ca62070b69
2010-02-13 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix over-4GiB seek on sparc64.
* include/grub/ieee1275/ieee1275.h (grub_ieee1275_seek):
Replace pos_i and pos_lo with pos. All users updated.
* include/grub/powerpc/ieee1275/ieee1275.h (GRUB_IEEE1275_CELL_SIZEOF):
New constant.
* include/grub/sparc64/ieee1275/ieee1275.h (GRUB_IEEE1275_CELL_SIZEOF):
Likewise.
* kern/ieee1275/ieee1275.c (grub_ieee1275_seek): Split pos into pos_hi
and pos_lo.
2010-02-13 16:13:28 +01:00
b274d734f3
2010-02-13 Vladimir Serbinenko <phcoder@gmail.com>
...
Properly create cross-endian images.
* include/grub/types.h (grub_host_to_target_addr): New macro
* util/grub-mkrawimage.c (generate_image): Add missing host_to_target.
2010-02-13 15:40:13 +01:00
6bea3f8983
merge sparc grub-mkimage into grub-mkrawimage
2010-02-12 20:08:56 +01:00
2d2a9cd5b6
GRUB_FILE implementation
2010-02-09 15:32:42 +01:00
1876cfdb56
GCJ
2010-02-08 02:01:10 +01:00
9d9dca02d9
Type 240
2010-02-08 01:44:06 +01:00
ca3112ba2d
merge cleanbuild into emu-modload
2010-02-08 00:21:55 +01:00
ec0be08d40
Clean building system
2010-02-07 23:49:49 +01:00
b359aa1373
Merge ofwclock into cleanbuild
2010-02-07 23:01:41 +01:00
e28e32ae51
2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/normal.h [GRUB_UTIL]: Remove leftover declarations.
* include/grub/partition.h [GRUB_UTIL]: Likewise.
2010-02-07 16:52:47 +01:00
6e14234c87
2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/multiboot2.h: Remove leftover file.
2010-02-07 16:51:16 +01:00
f38873b80b
Build system support for grub-emu modules
2010-02-07 15:17:26 +01:00
2083672af1
Remove -DGRUB_UTIL when compiling grub-emu
2010-02-07 04:23:44 +01:00
74e4934e1c
2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
of disk to dsk to avoid shadowing.
(find_free_slot): Fix prototype.
* util/getroot.c (grub_util_is_dmraid): Make static.
* include/grub/time.h (grub_get_rtc) [GRUB_MACHINE_EMU || GRUB_UTIL]:
Add missing prototype.
* util/sdl.c (grub_video_sdl_set_viewport): Remove.
2010-02-07 02:47:18 +01:00
58548abbc3
Remove data member in partition structure
2010-02-07 01:48:38 +01:00
8f891adc6f
2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/cache.h (grub_arch_sync_caches) [i386 || x86_64]: Inline.
* kern/i386/coreboot/init.c (grub_arch_sync_caches): Remove.
* kern/i386/efi/init.c (grub_arch_sync_caches): Likewise.
* kern/i386/ieee1275/init.c (grub_arch_sync_caches): Likewise.
* kern/i386/pc/init.c (grub_arch_sync_caches): Likewise.
* util/misc.c (grub_arch_sync_caches) [i386 || x86_64]: Likewise.
2010-02-07 00:52:31 +01:00
74b45184e4
2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/err.h (grub_err_printf): Don't export.
2010-02-07 00:46:09 +01:00
a4bced7752
2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/dl.h (grub_dl_register_symbol): Don't export.
2010-02-07 00:40:17 +01:00
007d0695e2
2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/i18n.h (grub_gettext_dummy): Removed.
* kern/misc.c (grub_gettext_dummy): Make static.
2010-02-07 00:36:18 +01:00
cc306106b9
Merge mainline into intwrap
2010-02-06 23:49:41 +01:00
f3e309ad7d
Use (hd0,msdos1) syntax. Eliminate partmap_iterate
2010-02-06 21:00:53 +01:00
bc6fcf0931
merge mainline into nestpart
2010-02-06 18:47:17 +01:00
15cb7d433f
Reimport nestpart
2010-02-06 18:43:37 +01:00
e190e3d2cc
merge mainline into ofwfb
2010-02-06 15:54:01 +01:00
d1de6ed1dc
First compiling newreloc for ppc (not yet tested)
2010-02-06 00:33:20 +01:00
1f534b6908
Merge mainline into gfxmenu
2010-02-03 01:24:07 +01:00
fbab7b0794
Framebuffer on PowerPC-based macs
2010-01-31 01:57:17 +01:00
6e308bd942
merge mainline into newreloc
2010-01-30 16:46:16 +01:00
275d6f6bd4
fix grub-script-check
2010-01-28 21:43:28 +05:30
de0b7a4ed1
2010-01-25 Carles Pina i Estany <carles@pina.cat>
...
* font/font.c: Include `grub/fontformat.h.
Remove font file format constants.
(grub_font_load): Use the new macros.
* include/grub/fontformat.h: New file.
* util/grub-mkfont.c: Include `grub/fontformat.c'.
(write_font_pf2): Use the new macros.
2010-01-26 20:16:08 +00:00
3973a59a34
2010-01-26 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_PXE_DL): New macro.
* boot/i386/pc/pxeboot.S: Include `<grub/machine/boot.h>'.
(_start): Macroify `0x7F'.
* kern/i386/pc/init.c: Include `<grub/machine/boot.h>'.
(make_install_device): Use "(pxe)" as fallback prefix when booting
via PXE.
2010-01-26 16:39:37 +00:00
6c624ae848
MErge mainline into lexer-rewrite
2010-01-23 19:37:13 +01:00
7d8c9ec63d
newreloc on yeeloong
2010-01-23 13:30:24 +01:00
10523df478
while and until loops support
2010-01-23 11:19:26 +05:30
4e6a305be4
for loop support to grub script
2010-01-23 11:03:41 +05:30
1fb08ed515
return arg count from grub_script_execute_arglist_to_argv
2010-01-23 09:12:46 +05:30
454fcd1c9b
2010-01-22 Vladimir Serbinenko <phcoder@gmail.com>
...
* configure.ac: Check for _restgpr_14_x.
* include/grub/powerpc/libgcc.h [HAVE__RESTGPR_14_X]: Add _restgpr_*_x
and _savegpr_* prototypes.
2010-01-22 20:40:21 +01:00
bae09d0d47
remove arbitrary limit on menuentry recording
2010-01-23 00:42:55 +05:30
df6dc2113a
removed arbitrary limit on token size
2010-01-23 00:14:00 +05:30
547e494f1b
lexer-rewrite rebase commit
2010-01-22 19:07:27 +05:30
f9ab2e25d3
2010-01-21 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/i386/bsd.h (FREEBSD_N_BIOS_GEOM): Removed.
(grub_freebsd_bootinfo): Rewritten.
* loader/i386/bsd.c (grub_freebsd_boot): Use new grub_freebsd_bootinfo.
2010-01-21 17:35:14 +01:00
61c501a941
merge mainline into newenv
2010-01-20 21:31:39 +01:00
f7fcb23c76
merge mainline into pciclean
2010-01-20 20:40:30 +01:00
3c83bc50db
merge bootcheck and mainline into newreloc
2010-01-20 11:48:36 +01:00
ca46729091
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/misc.h (grub_sprintf): Removed. All users switched to
grub_xasprintf or grub_snprintf.
(grub_vsprintf): Likewise.
(grub_snprintf): New proto.
(grub_vsnprintf): Likewise.
(grub_xasprintf): Likewise.
(grub_xvasprintf): Likewise.
* kern/misc.c (grub_vprintf): Use grub_vsnprintf_real.
(grub_sprintf): Removed.
(grub_vsnprintf): New function.
(grub_snprintf): Likewise.
(grub_xvasprintf): Likewise.
(grub_xasprintf): Likewise.
(grub_vsprintf): Renamed to ...
(grub_vsnprintf_real): ...this. New argument max_len.
2010-01-20 09:53:23 +01:00
61eb45eee7
Rename asprint into xasprintf and avsprintf into xvasprintf
2010-01-20 09:12:47 +01:00
aca655fd20
fix grub-script-check warnings
2010-01-20 12:48:35 +05:30
14284856a2
merge mainline into asprintf
2010-01-20 08:06:28 +01:00
7ee92c32e1
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/font.h (grub_font_load): Fix prototype.
2010-01-20 08:04:39 +01:00
119c50eab3
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/x86_64/at_keyboard.h: New file.
2010-01-20 08:02:45 +01:00
2d49abe9e7
merge mainline into asprintf
2010-01-20 07:36:17 +01:00
ca2a220a74
Resync
2010-01-20 00:47:55 +00:00
915fc1b8bf
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/multiboot.h: Resynced with spec.
* include/multiboot2.h: Likewise.
* loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap): Handle
GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE and GRUB_MACHINE_MEMORY_NVS.
2010-01-20 01:08:46 +01:00
b5b6745c87
kopenbsd serial support
2010-01-19 14:29:02 +01:00
5b512173a3
Tags for OpenBSD
2010-01-19 10:32:57 +01:00
96c713b69d
Eliminate variable-length types in parameters
2010-01-18 23:37:11 +01:00
96bdd17579
merge mainline into newreloc
2010-01-18 22:38:25 +01:00
e022a2d667
Sync with trunk
2010-01-18 20:51:35 +00:00
9444b678a1
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/term.h (grub_term_register_input,
grub_term_register_output): Check return of terminal init()
routines, and abort if errors are raised.
* commands/terminal.c: Update copyright year.
2010-01-18 19:43:39 +00:00
6f7db5d676
2010-01-18 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/i386/bsd.h: Fix include pathes.
2010-01-18 19:25:20 +01:00
d8a7de8d01
Remove memset() declaration (provided by <grub/misc.h>)
2010-01-18 17:39:04 +00:00
262bff8d83
2010-01-18 Vladimir Serbinenko <phcoder@gmail.com>
...
Add missing *BSD copyright headers.
* include/grub/aout.h: Add BSD licence.
* include/grub/i386/bsd.h: Parts under different licences moved to ...
* include/grub/i386/freebsd_linker.h: ... here,
* include/grub/i386/freebsd_reboot.h: ... here,
* include/grub/i386/netbsd_bootinfo.h: ... here,
* include/grub/i386/netbsd_reboot.h: ... here,
* include/grub/i386/openbsd_bootarg.h: ... here,
* include/grub/i386/openbsd_reboot.h: ... and here. Added appropriate
licence to each file.
2010-01-18 17:40:23 +01:00
85312e1933
kernel.h adjustments to fix build
2010-01-18 16:14:58 +00:00
e68d3b243f
Resync with trunk
2010-01-18 15:02:21 +00:00
45220d832e
Third version of the patch (sent to grub-devel in 2008-01-30)
2010-01-18 14:28:03 +00:00
c8298743f3
Second version of the patch (sent to grub-devel in 2008-01-29)
2010-01-18 14:24:17 +00:00
2c40cc7868
Import Tristan Gingold's ia64 port
...
(based on patch sent to grub-devel by Tristan in 2008-01-28)
2010-01-18 14:17:47 +00:00
6b9e2c181f
merge bootcheck into newreloc
2010-01-18 12:40:33 +01:00
8040619d88
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/i386/linux.h (GRUB_VIDEO_TYPE_TEXT): Rename to ...
(GRUB_VIDEO_LINUX_TYPE_TEXT): ... this. Update all users.
(GRUB_VIDEO_TYPE_VLFB): Rename to ...
(GRUB_VIDEO_LINUX_TYPE_VESA): ... this. Update all users.
(GRUB_VIDEO_TYPE_EFI): Rename to ...
(GRUB_VIDEO_LINUX_TYPE_SIMPLE): ... this. Update all users.
2010-01-18 07:49:50 +00:00
7728813a47
merge mainline into intwrap
2010-01-17 21:16:52 +01:00
1453b2ec7f
add extended regs support in bios_interrupt
2010-01-17 21:16:05 +01:00
88d2919b7d
Merge mainline into newreloc
2010-01-17 19:18:46 +01:00
a0c2a0f6ff
2010-01-17 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/test.h: Add license header.
* tests/example_functional_test.c: Likewise.
* tests/example_unit_test.c: Likewise.
* tests/lib/functional_test.c: Likewise.
* tests/lib/test.c: Likewise.
* tests/lib/unit_test.c: Likewise.
2010-01-17 17:29:57 +00:00
b0b139075e
2010-01-17 Vladimir Serbinenko <phcoder@gmail.com>
...
Use flag-based instead of hook-based video mode selection and "auto"
keyword.
* include/grub/video.h (grub_video_adapter): Changed 'setup' member.
(grub_video_set_mode): Changed prototype. All users updated.
(grub_video_check_mode_flag): New inline function.
* video/video.c (parse_modespec): New function.
(grub_video_set_mode): Parse flags and keywords.
2010-01-17 17:52:01 +01:00
72ebf8b87c
Sort chunks
2010-01-17 12:42:28 +01:00
5408044f4c
Multiboot 2 tags support
2010-01-16 16:25:43 +01:00
ae9eb98c7d
NetBSD module support
2010-01-16 11:47:12 +01:00
262355247f
merge mainline into newreloc
2010-01-16 00:05:33 +01:00
a0b766fc9b
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
...
Enable multiboot on non-pc.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (pkglib_MODULES): Move
multiboot.mod and multiboot2.mod to ...
* conf/i386.rmk (pkglib_MODULES): ... here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_SOURCES):
Moved to ...
* conf/i386.rmk (multiboot_mod_SOURCES): .. here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_CFLAGS):
Moved to ...
* conf/i386.rmk (multiboot_mod_CFLAGS): .. here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_ASFLAGS):
Moved to ...
* conf/i386.rmk (multiboot_mod_ASFLAGS): .. here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_LDFLAGS):
Moved to ...
* conf/i386.rmk (multiboot_mod_LDFLAGS): .. here.
* conf/x86_64-efi.rmk (pkglib_MODULES): Remove ata.mod and
relocator.mod.
(ata_mod_SOURCES): Removed.
(ata_mod_CFLAGS): Likewise.
(ata_mod_LDFLAGS): Likewise.
(relocator_mod_SOURCES): Removed.
(relocator_mod_CFLAGS): Likewise.
(relocator_mod_ASFLAGS): Likewise.
(relocator_mod_LDFLAGS): Likewise.
Include i386.mk.
* include/grub/x86_64/multiboot.h: New file.
* loader/i386/multiboot.c (grub_multiboot_boot) [GRUB_MACHINE_EFI]:
Terminate EFI.
2010-01-15 21:11:51 +01:00
884ade5654
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
...
Video multiboot support.
* include/grub/multiboot.h (grub_multiboot_set_accepts_video):
New prototype.
* include/multiboot.h: Resynced with multiboot specification.
* include/multiboot2.h: Likewise.
* loader/i386/multiboot.c (UNSUPPORTED_FLAGS): Support video flags.
(grub_multiboot): Parse MULTIBOOT_VIDEO_MODE fields.
* loader/i386/multiboot_mbi.c (DEFAULT_VIDEO_MODE): New constant.
(HAS_VGA_TEXT): Likewise.
(accepts_video): New variable.
(grub_multiboot_set_accepts_video): New function.
(grub_multiboot_get_mbi_size): Account for video structures.
(set_video_mode): New function.
(retrieve_video_parameters): Likewise.
(grub_multiboot_make_mbi): Fill video fields.
2010-01-15 16:30:57 +01:00
0d90e8a6fb
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
...
Video driver ids.
* include/grub/video.h (grub_video_driver_id): New type.
(grub_video_adapter): New member 'id'. All users updated.
(grub_video_get_driver_id): New proto.
* video/video.c (grub_video_get_driver_id): New function.
2010-01-15 16:11:18 +01:00
53fbae94a6
netbsd framebuffer support
2010-01-15 13:40:37 +01:00
9766dafa74
symtab support for knetbsd
2010-01-15 12:31:06 +01:00
5fb5182f8a
comX notation support
2010-01-15 11:48:15 +01:00
2386d586b9
Merge some knetbsdcode into kfreebsd one. Serial supoort for knetbsd
2010-01-15 11:39:05 +01:00
0a46429a55
2010-01-14 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/i386/loader.h (grub_linux16_boot): Renamed to ...
(grub_linux16_real_boot): ... this.
* kern/i386/loader.S: Likewise.
* loader/i386/pc/linux.c: Include `<grub/video.h>' and `<grub/mm.h>'.
(grub_linux16_boot): New function. Switches to text mode and calls
grub_linux16_real_boot().
* loader/i386/bsd.c: Include `<grub/video.h>'.
(grub_freebsd_boot, grub_openbsd_boot, grub_netbsd_boot): Switch to
text mode before calling grub_unix_real_boot().
* loader/i386/multiboot.c: Include `<grub/video.h>'.
(grub_multiboot_boot): Switch to text mode before calling
grub_relocator32_boot().
* loader/i386/pc/chainloader.c: Include `<grub/video.h>'.
(grub_chainloader_boot): Switch to text mode before calling
grub_chainloader_real_boot().
2010-01-14 21:08:31 +00:00
865a0f8aa7
elf symbols
2010-01-14 19:14:24 +01:00
96f60752d1
merge trunk
2010-01-14 18:45:19 +05:30
ea96d34596
Clarify type of bi_kernelname and bi_nfs_diskless
2010-01-14 13:40:17 +01:00
0b8891c276
removed unnecessary grub_test_* wrappers
2010-01-14 17:17:51 +05:30
3f995850a4
declare grub_multiboot_relocator in multiboot.h.
2010-01-13 20:49:13 +01:00
5ffb1b8494
Remove leftover grub_unix_real_boot
2010-01-13 20:47:05 +01:00
319fc3d213
Remove became useless i386/multiboot.h
2010-01-13 18:44:12 +01:00
ad184204b2
Remove leftover multiboot elpers
2010-01-13 18:41:49 +01:00
d1b3ffe8ce
merge efigfx into newreloc
2010-01-13 14:12:24 +01:00
c8142599fc
Merge i386/efi/linux.c into i386/linux.c
2010-01-13 14:03:54 +01:00
ca732b36c1
Video driver ID.
2010-01-13 14:03:18 +01:00
11aadbadfb
fix compilation on coreboot
2010-01-12 23:03:56 +01:00
e6e7b4ea1f
Remove i386/loader.h
2010-01-12 22:22:36 +01:00
c911e8791a
Port linux16 to relocator framework
2010-01-12 22:17:26 +01:00
14dacc815a
Clarify type of cmd_line_ptr
2010-01-12 22:16:33 +01:00
cdab631686
Relocator16 support
2010-01-12 22:15:50 +01:00
49a716be3b
Possibility to prefer higher or lower chunks in relocator
2010-01-12 22:14:26 +01:00
73910decff
Fix various bugs in *bsd. Freebsd64 on relocators
2010-01-12 17:50:11 +01:00
14933205d1
Relocator64 support
2010-01-12 17:48:51 +01:00
528aeaeabb
merge trunk
2010-01-12 11:02:49 +05:30
350285caae
removed unnecessary EXPORT_* macro usage
2010-01-12 09:23:24 +05:30
108408aa39
BSD on relocators
2010-01-11 22:54:40 +01:00
55b40bc68a
Ported linux to relocator framework
2010-01-11 14:59:01 +01:00
cb1b2ad7e0
Reenable XNU
2010-01-11 13:43:44 +01:00
5c8e58b0cb
merge abstractmbi into newreloc
2010-01-11 11:29:52 +01:00
cd0514794a
MAnipulate mbi in abstract way
2010-01-10 18:58:18 +01:00
14e43c6e02
First working newreloc
2010-01-10 15:06:17 +01:00
85a2cf749f
merge mainline into mips
2010-01-10 13:34:48 +01:00
6b60576149
merge mainline into newreloc
2010-01-10 01:56:47 +01:00
95c7fc3f55
First compileable newreloc
2010-01-10 00:30:33 +01:00
822873a7da
Eliminate grub_term_register_{input,output}_active. Default terminals are
...
automatically activated because they're the only terminal that has been loaded.
This solution is temporary. In the future, all terminals should auto-enable,
but this is non-trivial due to resource conflict, and it shouldn't prevent
merge in trunk.
2010-01-09 23:42:17 +01:00
75cc5b682e
Merge from trunk
2010-01-09 23:22:48 +01:00
4361ca1c37
Restructure rendering to make extensions easier
2010-01-08 18:48:41 +01:00
5cc318eb35
replaced __func__ with simpler __FUNCTION__ macro
2010-01-08 22:06:46 +05:30
169b1cd2d8
added functional tests to make-check
2010-01-08 16:35:32 +05:30
6fc804ffbb
unit testing framework
2010-01-08 15:19:10 +05:30
82c5d8dcfc
Support for 3 more combining marks types
2010-01-08 00:46:42 +01:00
bc8b32b3ec
2010-01-07 Robert Millan <rmh.grub@aybabtu.com>
...
Reset Multiboot 2 support. New loader implements the draft in
/branches/multiboot2 and shares as much code as possible with the
production Multiboot 1 implementation.
* loader/ieee1275/multiboot2.c: Remove file. Update all users.
* loader/multiboot2.c: Likewise.
* loader/i386/multiboot_helper.S: Likewise.
* include/multiboot2.h: Replace with latest version from the draft
in /branches/multiboot2.
* conf/i386-coreboot.rmk (multiboot_mod_SOURCES): Remove
`loader/i386/multiboot_helper.S', `loader/i386/pc/multiboot2.c'
and `loader/multiboot2.c'.
(pkglib_MODULES): Add `multiboot2.mod'.
(multiboot2_mod_SOURCES): New variable.
(multiboot2_mod_LDFLAGS): Likewise.
(multiboot2_mod_CFLAGS): Likewise. Define `GRUB_USE_MULTIBOOT2'.
* conf/i386-pc.rmk: Likewise.
* conf/powerpc-ieee1275.rmk (pkglib_MODULES): Remove `multiboot.mod'.
(multiboot_mod_SOURCES): Remove variable.
(multiboot_mod_LDFLAGS): Likewise.
(multiboot_mod_CFLAGS): Likewise.
* include/grub/multiboot.h [GRUB_USE_MULTIBOOT2]: Include
`<multiboot2.h>' instead of `<multiboot.h>'.
[GRUB_USE_MULTIBOOT2] (MULTIBOOT_BOOTLOADER_MAGIC)
(MULTIBOOT_HEADER_MAGIC): New macros.
* loader/multiboot_loader.c (module_version_status): Remove variable.
(find_multi_boot2_header): Remove function.
(grub_cmd_multiboot_loader): Remove Multiboot 2 / Multiboot 1 selection
logic. Always check for the Multiboot version we're compiling for.
(grub_cmd_module_loader): Likewise.
[GRUB_USE_MULTIBOOT2] (GRUB_MOD_INIT(multiboot)): Register `multiboot2'
command instead of `multiboot'.
2010-01-07 21:05:25 +00:00
44fcb2bc59
merge mainline into multiterm
2010-01-07 21:34:43 +01:00
97ea65d432
Add mirroring and stacked combining marks
2010-01-07 21:25:56 +01:00
5d2c52b8ca
2010-01-07 Robert Millan <rmh.grub@aybabtu.com>
...
* include/multiboot.h (MULTIBOOT_UNSUPPORTED): Moved from here ...
* loader/i386/multiboot.c (UNSUPPORTED_FLAGS): ... to here. Update
all users.
2010-01-07 19:55:16 +00:00
72f12cdcd9
Group combining diacritics
2010-01-07 16:37:53 +01:00
607a3701db
2010-01-07 Vladimir Serbinenko <phcoder@gmail.com>
...
Merge crypto branch.
* Makefile.in (pkglib_DATA): Add crypto.lst.
(crypto.lst): New target.
* commands/hashsum.c: New file.
* commands/password.c (check_password): Use grub_crypto_memcmp.
* commands/password_pbkdf2.c: New file.
* commands/xnu_uuid.c: Remove MD5. Use GRUB_MD_MD5.
* conf/any-emu.rmk (grub_emu_SOURCES): Add lib/crypto.c,
normal/crypto.c and lib/libgcrypt-grub/cipher/md5.c.
(grub_emu_CFLAGS): Add -Wno-missing-field-initializers -Wno-error
-I$(srcdir)/lib/libgcrypt_wrap.
* conf/common.rmk (normal_mod_SOURCES): Add normal/crypto.c.
(pkglib_MODULES): Add crypto.mod, hashsum.mod, pbkdf2.mod and
password_pbkdf2.mod.
(crypto_mod_SOURCES): New variable.
(crypto_mod_CFLAGS): Likewise.
(crypto_mod_LDFLAGS): Likewise.
(hashsum_mod_SOURCES): New variable.
(hashsum_mod_CFLAGS): Likewise.
(hashsum_mod_LDFLAGS): Likewise.
(pbkdf2_mod_SOURCES): New variable.
(pbkdf2_mod_CFLAGS): Likewise.
(pbkdf2_mod_LDFLAGS): Likewise.
(password_pbkdf2_mod_SOURCES): New variable.
(password_pbkdf2_mod_CFLAGS): Likewise.
(password_pbkdf2_mod_LDFLAGS): Likewise.
(bin_UTILITIES): Add grub-mkpasswd-pbkdf2.
(grub_mkpasswd_pbkdf2_SOURCES): New variable.
(grub_mkpasswd_pbkdf2_CFLAGS): Likewise.
Include conf/gcry.rmk.
* include/grub/auth.h: Rewritten.
* include/grub/crypto.h: New file.
* include/grub/disk.h (grub_disk_dev_id): Add GRUB_DISK_DEVICE_LUKS_ID.
* include/grub/normal.h (read_crypto_list): New prototype.
* lib/crypto.c: New file.
* lib/libgcrypt_wrap/cipher_wrap.h: Likewise.
* lib/pbkdf2.c: Likewise.
* normal/auth.c (grub_auth_strcmp): Removed.
(grub_iswordseparator): Likewise.
(grub_auth_strword): Likewise.
(is_authenticated): Use grub_strword.
(grub_auth_check_authentication): Use grub_strcmp, grub_password_get
and grub_strword. Pass entered password to authentication callback.
* normal/crypto.c: New file.
* normal/main.c: Call read_crypto_list.
* util/grub-mkpasswd-pbkdf2.c: New file.
* util/import_gcry.py: Generate crypto.lst. Add hash blocklen.
2010-01-07 01:13:01 +01:00
f0cfb703b8
Initial bidi support for gfxmenu
2010-01-06 20:37:16 +01:00
4d253049d5
Fix non-clearing of timeout. Template support for timeout text.
2010-01-06 01:42:21 +01:00
27708b75ca
Merge gfxmenu into gfxmenu+multiterm
2010-01-05 19:38:50 +01:00
b9da170080
Preliminary support for mixed percent and linear declarations
2010-01-05 19:38:11 +01:00
e6e86df1de
Merge multiterm into gfxmenu+multiterm
2010-01-05 16:34:10 +01:00
519634516f
Merge mainline into multiterm
2010-01-05 16:27:41 +01:00
52c2d97f26
2010-01-04 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/efi/api.h (GRUB_EFI_PIWG_DEVICE_PATH_SUBTYPE):
New constant.
(grub_efi_piwg_device_path): New structure
(grub_efi_piwg_device_path_t): New type.
* loader/efi/appleloader.c (piwg_full_device_path): New structure.
(devpath_1): Transform to a structure. All users updated.
(devpath_2): Likewise.
(devpath_3): Likewise.
(devpath_4): Likewise.
(devpath_5): Likewise.
2010-01-04 14:59:06 +01:00
3a73dcb6f5
2010-01-03 Robert Millan <rmh.grub@aybabtu.com>
...
* boot/i386/pc/diskboot.S: Fix inaccurate comment.
* util/i386/pc/grub-setup.c: Include `<assert.h>'.
(struct boot_blocklist): Move from here ...
* include/grub/i386/pc/boot.h [ASM_FILE]
(struct grub_boot_blocklist): ... to here. Update all users.
(setup): Only initialize `start' member of `first_block'
structure. Add assert() calls to verify the other members.
* util/i386/pc/grub-mkimage.c: Include `<assert.h>'.
(generate_image): Fix broken blocklist length initialization.
Add assert() call to verify blocklist `segment' field.
2010-01-03 22:34:03 +00:00
58bc8bd5b1
2010-01-03 Robert Millan <rmh.grub@aybabtu.com>
...
* boot/i386/pc/boot.S: Update copyright year.
* boot/i386/pc/cdboot.S: Likewise.
* boot/i386/pc/diskboot.S: Likewise.
* boot/i386/pc/lnxboot.S: Likewise.
* boot/i386/pc/pxeboot.S: Likewise.
* bus/pci.c: Likewise.
* commands/cmp.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/ls.c: Likewise.
* commands/test.c: Likewise.
* disk/dmraid_nvidia.c: Likewise.
* disk/i386/pc/biosdisk.c: Likewise.
* disk/ieee1275/nand.c: Likewise.
* disk/ieee1275/ofdisk.c: Likewise.
* disk/lvm.c: Likewise.
* disk/raid.c: Likewise.
* disk/raid6_recover.c: Likewise.
* disk/scsi.c: Likewise.
* fs/affs.c: Likewise.
* fs/cpio.c: Likewise.
* fs/ext2.c: Likewise.
* fs/hfs.c: Likewise.
* fs/iso9660.c: Likewise.
* fs/ntfs.c: Likewise.
* fs/sfs.c: Likewise.
* fs/udf.c: Likewise.
* fs/ufs.c: Likewise.
* fs/xfs.c: Likewise.
* gencmdlist.sh: Likewise.
* genmk.rb: Likewise.
* include/grub/disk.h: Likewise.
* include/grub/efi/api.h: Likewise.
* include/grub/efi/efi.h: Likewise.
* include/grub/efi/pe32.h: Likewise.
* include/grub/elf.h: Likewise.
* include/grub/fs.h: Likewise.
* include/grub/i386/at_keyboard.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* include/grub/i386/pc/vbe.h: Likewise.
* include/grub/i386/pci.h: Likewise.
* include/grub/i386/tsc.h: Likewise.
* include/grub/ieee1275/ieee1275.h: Likewise.
* include/grub/ntfs.h: Likewise.
* include/grub/sparc64/ieee1275/ieee1275.h: Likewise.
* include/grub/sparc64/libgcc.h: Likewise.
* include/grub/symbol.h: Likewise.
* include/grub/types.h: Likewise.
* include/multiboot2.h: Likewise.
* io/gzio.c: Likewise.
* kern/device.c: Likewise.
* kern/disk.c: Likewise.
* kern/efi/efi.c: Likewise.
* kern/efi/mm.c: Likewise.
* kern/elf.c: Likewise.
* kern/file.c: Likewise.
* kern/i386/dl.c: Likewise.
* kern/i386/pc/init.c: Likewise.
* kern/i386/pc/startup.S: Likewise.
* kern/ieee1275/ieee1275.c: Likewise.
* kern/ieee1275/init.c: Likewise.
* kern/main.c: Likewise.
* kern/mm.c: Likewise.
* kern/powerpc/dl.c: Likewise.
* kern/sparc64/dl.c: Likewise.
* kern/x86_64/dl.c: Likewise.
* lib/hexdump.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/i386/pc/multiboot2.c: Likewise.
* loader/ieee1275/multiboot2.c: Likewise.
* loader/multiboot2.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* normal/completion.c: Likewise.
* normal/menu_entry.c: Likewise.
* partmap/apple.c: Likewise.
* util/grub.d/10_hurd.in: Likewise.
* util/hostfs.c: Likewise.
* video/readers/png.c: Likewise.
2010-01-03 22:05:07 +00:00
e2d70b5cea
2010-01-03 Colin Watson <cjwatson@ubuntu.com>
...
* include/grub/misc.h (GNUC_PREREQ): New macro.
(ATTRIBUTE_ERROR): New macro.
* include/grub/list.h (grub_bad_type_cast_real): Use
ATTRIBUTE_ERROR.
2010-01-03 21:50:53 +00:00
2f1a3acf75
2009-01-01 Yves Blusseau <yves.blusseau@zetam.org>
...
* configure.ac: check external intl library
* Makefile.in: add compiler and linker flags to properly compile with
intl library
* include/grub/i18n.h: add a check to disable NLS
* util/misc.c (grub_util_init_nls): new function
* include/grub/util/misc.h: likewise
* util/elf/grub-mkimage.c: use the new function below to initialize NLS
* util/grub-editenv.c: likewise
* util/grub-emu.c: likewise
* util/grub-fstest.c: likewise
* util/grub-mkdevicemap.c: likewise
* util/grub-mkfont.c: likewise
* util/grub-mkrelpath.c: likewise
* util/grub-probe.c: likewise
* util/i386/pc/grub-mkimage.c: likewise
* util/i386/pc/grub-setup.c: likewise
* util/sparc64/ieee1275/grub-mkimage.c: likewise
* util/sparc64/ieee1275/grub-ofpathname.c: likewise
* util/sparc64/ieee1275/grub-setup.c: likewise
* util/mkisofs/mkisofs.h: add a check to disable NLS
* util/mkisofs/mkisofs.c: likewise
2010-01-01 21:32:30 +01:00
3393790450
2010-01-01 Carles Pina i Estany <carles@pina.cat>
...
* commands/help.c: Include `grub/mm.h' and `grub/normal.h'.
(grub_cmd_help): Print the cmd->name before the cmd->summary. Cut the
string using string width.
* normal/menu_text.c (grub_print_message_indented): Use
grub_print_spaces and not print_spaces.
(print_timeout): Likewise.
(print_spaces): Move to...
* include/grub/term.h: ... here. Change the name to grub_print_spaces.
2010-01-01 18:58:00 +01:00
33433555f3
2009-12-31 BVK Chaitanya <bvk.groups@gmail.com>
...
* include/grub/list.h (grub_assert_fail): Removed.
(grub_bad_type_cast_real): New function.
(grub_bad_type_cast): New macro.
(GRUB_AS_LIST): Use grub_bad_type_cast.
(GRUB_AS_LIST_P): Likewise.
(GRUB_AS_NAMED_LIST): Likewise.
(GRUB_AS_NAMED_LIST_P): Likewise.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
* include/grub/handler.h (GRUB_AS_HANDLER): Likewise.
2009-12-31 15:03:09 +01:00
eb3f57d3c4
proof of concept interrupt wrapping
2009-12-31 13:07:51 +01:00
16c8e9fd66
Reimport hotkey support
2009-12-29 23:01:12 +01:00
5fab62c06e
merge gfxmenu into gfxmenu+mulitterm
2009-12-29 17:33:35 +01:00
9a17588459
Initial support for scalable gfxmenu
2009-12-29 17:31:02 +01:00
8b442f3f4c
asprintf and snprintf support
2009-12-29 10:04:06 +01:00
7b74857658
Search hinting support
2009-12-28 14:02:23 +01:00
742e1f7e72
merge mainline into mips
2009-12-28 01:05:47 +01:00
e20d3e608c
merge multiterm into gfxmenu+multiterm
2009-12-26 16:42:55 +01:00
d3ee2d201e
Various fixes to make gfxmenu work smoothly in multioutput environment
2009-12-26 16:41:54 +01:00
27a8ee52b4
Remove menu init hooks. They are useless
2009-12-26 16:39:16 +01:00
9b1209ba15
Cache loaded theme
2009-12-26 02:37:01 +01:00
bee140683a
Initial effort for gfxmenu on multiterm branch
2009-12-26 01:49:57 +01:00
d94000ed13
Merge from trunk
2009-12-25 22:29:47 +00:00
9c288be27a
2009-12-25 Vladimir Serbinenko <phcoder@gmail.com>
...
Use search command for preliminar UUID search.
* commands/search.c: Split into ...
* commands/search_wrap.c: ...this
* commands/search.c: ...and this.
* commands/search_file.c: New file.
* commands/search_label.c: New file.
* commands/search_uuid.c: New file.
* conf/any-emu.rmk (grub_emu_SOURCES): Remove commands/search.c.
Add commands/search_wrap.c, commands/search_file.c,
commands/search_label.c and commands/search_uuid.c.
* conf/common.rmk (pkglib_MODULES): Remove fs_uuid.mod and fs_file.mod.
(search_mod_SOURCES): Set to commands/search_wrap.c.
(pkglib_MODULES): Add search_fs_file.mod, search_fs_uuid.mod and
search_label.mod.
(search_fs_file_mod_SOURCES): New variable.
(search_fs_file_mod_CFLAGS): Likewise.
(search_fs_file_mod_LDFLAGS): Likewise.
(search_label_mod_SOURCES): Likewise.
(search_label_mod_CFLAGS): Likewise.
(search_label_mod_LDFLAGS): Likewise.
(search_fs_uuid_mod_SOURCES): New variable.
(search_fs_uuid_mod_CFLAGS): Likewise.
(search_fs_uuid_mod_LDFLAGS): Likewise.
(fs_file_mod_SOURCES): Removed.
(fs_file_mod_CFLAGS): Likewise.
(fs_file_mod_LDFLAGS): Likewise.
(fs_uuid_mod_SOURCES): Removed.
(fs_uuid_mod_CFLAGS): Likewise.
(fs_uuid_mod_LDFLAGS): Likewise.
* conf/sparc64-ieee1275.rmk (grub_install_SOURCES):
Set to util/grub-install.in.
* disk/fs_file.c: Removed.
* disk/fs_uuid.c: Likewise.
* include/grub/search.h: New file.
* util/grub-install.in: Handle sparc64.
Create and use load.cfg.
* util/sparc64/ieee1275/grub-install.in: Removed.
2009-12-25 23:06:52 +01:00
7ebaa2b4ff
2009-12-25 Vladimir Serbinenko <phcoder@gmail.com>
...
Support for (pxe[:server[:gateway]]) syntax and
use environment variable for PXE.
* commands/i386/pc/pxecmd.c (options): Removed.
(print_ip): Removed.
(grub_cmd_pxe): Removed
(grub_cmd_pxe_unload): New function.
* fs/i386/pc/pxe.c (grub_pxe_disk_data): New structure.
(grub_pxe_your_ip): Made static.
(grub_pxe_default_server_ip): Likewise.
(grub_pxe_default_gateway_ip): Likewise.
(grub_pxe_blksize): Likewise.
(parse_ip): New function.
(grub_pxe_open): Support server and gateway specification.
(grub_pxe_close): Free disk->data.
(grub_pxefs_open): Use disk->data.
(grub_pxefs_read): Likewise.
(grub_env_write_readonly): New function.
(set_mac_env): Likewise.
(set_env_limn_ro): Likewise.
(parse_dhcp_vendor): Likewise.
(grub_pxe_detect): Set the environment variables.
(set_ip_env): New function.
(write_ip_env): Likewise.
(grub_env_write_pxe_default_server): Likewise.
(grub_env_write_pxe_default_gateway): Likewise.
(grub_env_write_pxe_blocksize): Likewise.
(GRUB_MOD_INIT(pxe)): Set environment variables.
* include/grub/i386/pc/pxe.h (grub_pxe_mac_addr): Rename to ...
(grub_pxe_mac_addr_t): ... this. All users updated.
(grub_pxe_your_ip): Removed.
(grub_pxe_server_ip): Likewise.
(grub_pxe_gateway_ip): Likewise.
(grub_pxe_blksize): Likewise.
2009-12-25 22:01:06 +01:00
2281552630
2009-12-25 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/i386/at_keyboard.h (NUM_LOCK, SCROLL_LOCK): New macros.
* term/i386/pc/at_keyboard.c (KEYBOARD_STATUS_NUM_LOCK)
(KEYBOARD_LED_SCROLL, KEYBOARD_LED_NUM, KEYBOARD_LED_CAPS): New macros.
(led_status): New variable.
(keyboard_controller_led): New function.
(grub_at_keyboard_getkey_noblock): Handle num lock and scroll lock,
update led status for caps lock, num lock and scroll lock.
2009-12-25 20:33:41 +00:00
9f293ab0df
merge mainline into gfxmenu
2009-12-25 21:32:46 +01:00
6066889c88
normal_exit command
2009-12-25 16:28:31 +01:00
427d6aa453
Merge my local branch
2009-12-25 12:43:20 +01:00
33c1ed4c8d
terminal modules autoloading
2009-12-25 03:37:20 +01:00
fa533ebb5c
Various fixes to make multiterm work
2009-12-25 01:13:21 +01:00
840f2e6e08
Remove NEED_INIT.
2009-12-25 00:12:36 +01:00
7fd0baee0f
2009-12-24 Carles Pina i Estany <carles@pina.cat>
...
* bus/usb/usbhub.c: Fix capitalization, fullstop and newlines in
grub_errno calls.
* commands/acpi.c: Likewise.
* commands/blocklist.c: Likewise.
* commands/efi/loadbios.c: Likewise.
* commands/i386/pc/drivemap.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/memrw.c: Likewise.
* commands/password.c: Likewise.
* commands/videotest.c: Likewise.
* disk/ata.c: Likewise.
* disk/ata_pthru.c: Likewise.
* disk/dmraid_nvidia.c: Likewise.
* disk/ieee1275/nand.c: Likewise.
* disk/ieee1275/ofdisk.c: Likewise.
* disk/loopback.c: Likewise.
* disk/lvm.c: Likewise.
* disk/mdraid_linux.c: Likewise.
* disk/raid.c: Likewise.
* disk/raid6_recover.c: Likewise.
* disk/scsi.c: Likewise.
* efiemu/main.c: Likewise.
* efiemu/mm.c: Likewise.
* efiemu/pnvram.c: Likewise.
* efiemu/symbols.c: Likewise.
* font/font.c: Likewise.
* fs/cpio.c: Likewise.
* fs/hfsplus.c: Likewise.
* fs/iso9660.c: Likewise.
* fs/jfs.c: Likewise.
* fs/minix.c: Likewise.
* fs/ntfs.c: Likewise.
* fs/ntfscomp.c: Likewise.
* fs/reiserfs.c: Likewise.
* fs/ufs.c: Likewise.
* fs/xfs.c: Likewise.
* gettext/gettext.c: Likewise.
* include/grub/auth.h: Likewise.
* kern/elf.c: Likewise.
* kern/file.c: Likewise.
* kern/ieee1275/init.c: Likewise.
* kern/ieee1275/mmap.c: Likewise.
* kern/ieee1275/openfw.c: Likewise.
* kern/powerpc/dl.c: Likewise.
* kern/sparc64/dl.c: Likewise.
* lib/arg.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/bsdXX.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/efi/xnu.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/multiboot.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/i386/pc/multiboot2.c: Likewise.
* loader/i386/xnu.c: Likewise.
* loader/ieee1275/multiboot2.c: Likewise.
* loader/macho.c: Likewise.
* loader/machoXX.c: Likewise.
* loader/multiboot2.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/sparc64/ieee1275/linux.c: Likewise.
* loader/xnu.c: Likewise.
* loader/xnu_resume.c: Likewise.
* mmap/i386/pc/mmap.c: Likewise.
* normal/menu_viewer.c: Likewise.
* partmap/acorn.c: Likewise.
* partmap/amiga.c: Likewise.
* partmap/apple.c: Likewise.
* script/lexer.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/i386/pc/vga.c: Likewise.
* term/ieee1275/ofconsole.c: Likewise.
* term/terminfo.c: Likewise.
* video/bitmap.c: Likewise.
* video/efi_gop.c: Likewise.
* video/efi_uga.c: Likewise.
* video/fb/video_fb.c: Likewise.
* video/i386/pc/vbe.c: Likewise.
* video/readers/tga.c: Likewise.
* video/video.c: Likewise.
2009-12-24 23:53:05 +01:00
9f0cd916a4
Restrict terminfo to serial
2009-12-24 23:20:43 +01:00
0aa6339849
Working multi-terminal
2009-12-24 21:54:37 +01:00
3be7f8de12
FORALL_ACTIVE_TERM_OUTPUTS macro
2009-12-24 17:51:43 +01:00
8eca55a6eb
Imported nyu's multi-input
2009-12-24 17:08:14 +01:00
2e71383172
Core changes hopefully finished
2009-12-24 15:34:33 +01:00
d14d33704e
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
...
* include/multiboot.h: Indentation fixes.
2009-12-24 14:19:22 +00:00
eeed10b4dd
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
...
* include/multiboot.h (struct multiboot_aout_symbol_table)
(struct multiboot_elf_section_header_table): New structure
declarations (stolen from GRUB Legacy).
(struct multiboot_info): Replace opaque `syms' with a.out and ELF
table information.
(multiboot_aout_symbol_table_t, multiboot_elf_section_header_table_t)
(multiboot_info_t, multiboot_memory_map_t, multiboot_module_t): New
type aliases.
2009-12-24 14:15:32 +00:00
681c70ab14
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
...
* include/multiboot.h: Make comments src2texi-friendly.
2009-12-24 14:11:14 +00:00
e4d47d8d64
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
...
For consistency with [multiboot]/docs/boot.S.
* include/multiboot.h (MULTIBOOT_MAGIC): Rename from this ...
(MULTIBOOT_HEADER_MAGIC): ... to this. Update all users.
(MULTIBOOT_MAGIC2): Rename from this ...
(MULTIBOOT_BOOTLOADER_MAGIC): ... to this. Update all users.
2009-12-24 14:09:06 +00:00
a0b70bda6c
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
...
* include/multiboot.h: Remove `<grub/types.h>'.
(multiboot_uint16_t, multiboot_uint32_t, multiboot_uint64_t): New
types. Update all users.
2009-12-24 14:03:22 +00:00
e48625a306
merge crypto into multiout
2009-12-24 00:38:41 +01:00
f4c623e170
Work on multi-out terminal
2009-12-24 00:37:11 +01:00
a2e77ce455
merge mainline into crypto
2009-12-23 20:34:26 +01:00
a2c1332b70
2009-12-23 Felix Zielcke <fzielcke@z-51.de>
...
* commands/i386/pc/drivemap.c: Remove all trailing whitespace.
* commands/lspci.c: Likewise.
* commands/probe.c: Likewise.
* commands/xnu_uuid.c: Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-pc.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* fs/i386/pc/pxe.c: Likewise.
* gettext/gettext.c: Likewise.
* include/grub/efi/graphics_output.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* kern/env.c: Likewise.
* kern/i386/qemu/startup.S: Likewise.
* lib/i386/pc/biosnum.c: Likewise.
* lib/i386/relocator.c: Likewise.
* lib/i386/relocator_asm.S: Likewise.
* lib/relocator.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/multiboot.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/xnu.c: Likewise.
* loader/xnu.c: Likewise.
* normal/main.c: Likewise.
* normal/menu_text.c: Likewise.
* util/getroot.c: Likewise.
* util/grub-mkconfig_lib.in: Likewise.
* util/grub.d/00_header.in: Likewise.
* util/i386/pc/grub-mkimage.c: Likewise.
* util/mkisofs/eltorito.c: Likewise.
* util/mkisofs/exclude.h: Likewise.
* util/mkisofs/hash.c: Likewise.
* util/mkisofs/iso9660.h: Likewise.
* util/mkisofs/joliet.c: Likewise.
* util/mkisofs/mkisofs.c: Likewise.
* util/mkisofs/mkisofs.h: Likewise.
* util/mkisofs/multi.c: Likewise.
* util/mkisofs/name.c: Likewise.
* util/mkisofs/rock.c: Likewise.
* util/mkisofs/tree.c: Likewise.
* util/mkisofs/write.c: Likewise.
* video/efi_gop.c: Likewise.
2009-12-23 17:41:32 +01:00
7316783f35
Crypto module autoloading
2009-12-23 17:33:35 +01:00
fbb8a88714
Byte-addressable PCI config space
2009-12-22 15:09:25 +01:00
ba136b293a
merge mainline into crypto
2009-12-22 14:28:39 +01:00
0866ec655e
merge mainline to newenv
2009-12-22 14:14:28 +01:00
2a2869b584
merge mainline into efigfx
2009-12-22 13:34:01 +01:00
7f39d92f8d
2009-12-20 Carles Pina i Estany <carles@pina.cat>
...
* include/grub/auth.h: Include `<grub/i18n.h>'.
(GRUB_GET_PASSWORD): Gettextizze string.
* include/grub/normal.h (STANDARD_MARGIN): New macro, moved from
menu_text.c.
(grub_utf8_to_ucs4_alloc): Fix indentation.
(grub_print_ucs4): Likewise.
(grub_getstringwidth): Likewise.
(print_message_indented): New declaration.
* normal/auth.c: Include `<grub/i18n.h>'.
(grub_auth_check_authentication): Gettexttize string.
* normal/cmdline.c: Include `<grub/i18n.h>'.
(grub_cmdline_get): Gettextizze.
* normal/color.c: Include `<grub/i18n.h>'.
(grub_parse_color_name_pair): Gettexttize strings.
* normal/main.c (grub_normal_reader_init): Cleanup gettexttized
string (use `print_message_indented').
* normal/menu_text.c (STANDARD_MARGIN): Moved from here to
`include/grub/normal.h'.
(print_message_indented): Renamed to ...
(grub_print_message_indented): ... this. Remove `static' qualifer (now
used in normal/main.c).
(print_message): Use `grub_print_message_indented' instead of
`print_message_indented'.
(print_timeout): Likewise.
* normal/misc.c: Include `<grub/term.h>' and `<grub/i18n.h>'.
(grub_normal_print_device_info): Gettexttize strings.
* po/POTFILES: Add `auth.c', `color.c' and `misc.c'.
2009-12-20 23:32:15 +00:00
8140d50bdc
PXE environment variables
2009-12-20 20:05:53 +01:00
902a478aab
merge trunk into newenv
2009-12-20 14:20:37 +01:00
e0a6ca52f2
2009-12-19 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/types.h (UNUSED): Removed since it conflicts with
NetBSD headers. All users changed to direct __attribute__ ((unused)).
Reported by Grégoire Sutre.
2009-12-20 14:09:16 +01:00
2fbcbbc389
Save 314 bytes on not handling contexts in core
2009-12-20 02:52:39 +01:00
b99518d1ce
2009-12-19 Carles Pina i Estany <carles@pina.cat>
...
* include/grub/normal.h (grub_utf8_to_ucs4): New declaration.
(grub_print_ucs4_alloc): Likewise.
(grub_getstringwidth): Likewise.
* normal/main.c (grub_normal_init_page): Gettextize version string.
* normal/menu_text.c (grub_utf8_to_ucs4_alloc): New definition.
(getstringwidth): Renamed to ...
(grub_getstringwidth): ... this. Remove `static' qualifier (now used
in normal/main.c). Use `grub_utf8_to_ucs4_alloc'.
(grub_print_ucs4): Remove `static' qualifer (now used in
normal/main.c).
* po/POTFILES: Add normal/main.c.
2009-12-19 23:00:30 +00:00
0d48a435a0
2009-12-19 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/types.h (UNUSED): Removed since it conflicts with
NetBSD headers. All users changed to direct __attribute__ ((unused)).
Reported by Grégoire Sutre.
2009-12-19 21:30:00 +01:00
7ea73643f5
merge mtrunk into xnu
2009-12-18 03:57:32 +01:00
b044bf0351
use video subsystem on EFI
2009-12-16 19:04:58 +01:00
45da21ff5a
merge mainline into videomask
2009-12-16 17:52:17 +01:00
c179ebe4ee
2009-12-16 Vladimir Serbinenko <phcoder@gmail.com>
...
UUID support for HFS.
* fs/hfs.c (grub_hfs_uuid): New function.
(grub_hfs_fs): New value .uuid.
* include/grub/hfs.h (grub_hfs_sblock): New field 'num_serial'.
2009-12-16 15:40:31 +01:00
c4a3e41a72
2009-12-13 Carles Pina i Estany <carles@pina.cat>
...
* include/grub/misc.h (grub_puts): New declaration.
(grub_puts_): Likewise.
* kern/mis.c (grub_puts): New definition.
(grub_puts_): Likewise.
2009-12-13 19:51:08 +00:00
648fb15b29
Merge from trunk
2009-12-13 18:41:21 +00:00
b50b77b9a8
Merge relocator branch
2009-12-13 18:37:44 +00:00
4d902d3715
merge from trunk
2009-12-12 02:38:30 +01:00
b66948bd88
setjmp on mips
2009-12-12 02:33:41 +01:00
37ba589a4e
Merge from trunk
2009-12-12 00:07:45 +00:00
cbf73baaae
Indentation fix & missing copyright year.
2009-12-11 23:10:57 +00:00
dfec2d96f9
Merge from trunk
2009-12-11 21:20:00 +00:00
838114b687
Merge from trunk
2009-12-11 21:15:58 +00:00
d4af2a73dc
datetime for yeeloong
2009-12-11 22:14:09 +01:00
2a3aa4d570
Merge pciaccess branch
2009-12-11 21:12:57 +00:00
febfc12c6e
2009-12-10 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/mips/libgcc.h: Only export symbols for functions
that libgcc provides.
2009-12-10 22:38:54 +00:00
2e59983c82
2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
...
Eliminate NTFS 4Gib barrier.
* fs/ntfs.c (read_attr): Use grub_disk_addr_t and grub_size_t.
(read_run_data): Likewise.
(grub_ntfs_read_run_list): Likewise.
(grub_ntfs_read_block): Likewise.
(grub_ntfs_iterate_dir): Likewise.
(read_mft): Likewise.
(read_data): Likewise.
Use COM_LOG_LEN.
* fs/ntfscomp.c (read_block): Cast ctx->target_vcn & 0xF to unsigned
to avoid 64-bit division
* include/grub/ntfs.h (COM_LOG_LEN): New definition.
(grub_ntfs_rlst): Use grub_disk_addr_t.
2009-12-10 14:45:00 +01:00
d114e89ca8
Add clock
2009-12-09 17:58:48 +01:00
e3069ec1a5
2009-12-08 Carles Pina i Estany <carles@pina.cat>
...
* include/grub/misc.h (grub_printf_): New declaration.
* kern/misc.c (grub_printf_): New definition.
* normal/main.c (grub_normal_reader_init): Use `grub_printf_' and `N_'
instead of `grub_printf' and `_'.
* normal/menu_entry.c (store_completion): Likewise.
(run): Likewise.
(grub_menu_entry_run): Likewise.
* normal/menu_text.c (grub_wait_after_message): Likewise.
(notify_booting): Likewise.
(notify_fallback): Likewise.
(notify_execution_failure): Likewise.
2009-12-08 00:08:52 +00:00
d6ceebf1d9
2009-12-07 Colin Watson <cjwatson@ubuntu.com>
...
* configure.ac: Check for vasprintf.
* util/misc.c (asprintf): Move allocation from here ...
(vasprintf): ... to here. New function.
(xasprintf): New function.
* include/grub/util/misc.h (vasprintf, xasprintf): Add
prototypes.
* util/getroot.c (grub_util_get_grub_dev): Use xasprintf.
* util/grub-mkfont.c (write_font): Likewise.
* util/grub-probe.c (probe): Likewise.
* util/hostdisk.c (make_device_name): Likewise.
2009-12-07 16:46:24 +00:00
0f355bc6b3
add memory routines
2009-12-07 16:16:10 +01:00
d5b44e501d
retrieve firmware arguments
2009-12-07 02:09:39 +01:00
b391bdb2f2
Use dedicated simple password retriever for size of future crypto disks modules and simplify entering passwords routines
2009-12-06 20:11:50 +01:00
7d624c2949
merge mainline into crypto
2009-12-05 16:34:27 +01:00
9d1fafb96e
Move include/grub/cipher_wrap.h to lib/libgcrypt_wrap/cipher_wrap.h
2009-12-05 16:33:39 +01:00
c4282e6cb3
Remove mips/reboot.h.
2009-12-04 00:05:48 +00:00
69ac6c405a
Merge from trunk
2009-12-04 00:04:41 +00:00
6b8474f8e8
2009-12-04 Robert Millan <rmh.grub@aybabtu.com>
...
* commands/halt.c: Replace misc arch-specific headers with
`<grub/misc.h>'.
* commands/reboot.c: Likewise.
* commands/i386/pc/halt.c: Replace `<grub/machine/init.h>' with
`<grub/misc.h>'.
* conf/i386-coreboot.rmk (kernel_img_HEADERS): Remove `cpu/reboot.h'.
(halt_mod_SOURCES): Move `kern/i386/halt.c' from here ...
(kernel_img_SOURCES): ... to here.
* include/grub/efi/efi.h (grub_reboot, grub_halt): Remove prototypes.
* include/grub/i386/pc/init.h: Likewise.
* include/grub/powerpc/ieee1275/kernel.h: Likewise.
* include/grub/sparc64/ieee1275/kernel.h: Likewise.
* include/grub/misc.h (grub_reboot, grub_halt): New prototypes.
* include/grub/i386/halt.h: Remove.
* include/grub/i386/reboot.h: Likewise.
* kern/i386/halt.c: Remove `<grub/cpu/halt.h>'.
2009-12-03 23:07:29 +00:00
5239348f18
2009-12-02 Robert Millan <rmh.grub@aybabtu.com>
...
Use the same reboot approach on i386 coreboot and qemu as we do on
BIOS.
* conf/i386-coreboot.rmk (kernel_img_HEADERS): Add `cpu/reboot.h'.
(reboot_mod_SOURCES): Remove `kern/i386/reboot.c'.
* kern/i386/reboot.c: Remove.
* include/grub/i386/reboot.h (grub_reboot): Export function.
* kern/i386/pc/startup.S (grub_reboot): Move from here ...
* kern/i386/realmode.S (grub_reboot): ... to here. Jump to
0xf000:0xfff0 instead of 0xffff:0x0000.
[!GRUB_MACHINE_PCBIOS] (prot_to_real): Do not restore interrupts.
* kern/i386/qemu/startup.S: Include `"../realmode.S"'.
2009-12-02 22:48:02 +00:00
035a008c13
Remove leftover
2009-12-02 11:44:29 +01:00
537ee0a5f1
Merge relocators into mips
2009-12-02 09:55:04 +01:00
4f41a23d4e
merge mainline into mips
2009-12-02 09:51:36 +01:00
7b5f334bc0
Rename qemu-r4k to qemu-mips
2009-12-02 08:49:36 +01:00
e6b9873356
Remove qemu-mipssim
2009-12-02 08:40:51 +01:00
3e5c7dc3d8
Fix qemu-r4k
2009-12-02 08:39:17 +01:00
e45f7848e6
merged mainline into pci
2009-11-30 16:39:59 +01:00
9ec25583a9
Merge bmpidx into gfxmenu
2009-11-29 15:25:13 +01:00
f704cae368
Fix declarations of previous commit
2009-11-28 00:46:09 +01:00
1708050b6f
GOP support
...
Also-By: Bean Lee <>
2009-11-28 00:15:04 +01:00
3d1933fb20
Fix compilation on x86_64-efi
2009-11-27 10:57:52 +01:00
159194989d
Ported xnu to relocator framework
2009-11-27 09:42:50 +01:00
105b69abbd
merged relocators into mips
2009-11-26 21:42:31 +01:00
53e08cc54c
Merged mainstream into newuuid
2009-11-25 23:50:54 +01:00
636813f768
Split relocators from mips branch
2009-11-25 23:39:59 +01:00
bde358ac91
merged with mainline
2009-11-25 23:17:32 +01:00
e4612999e6
Merge from trunk.
2009-11-25 21:34:53 +00:00
0e8489094a
mainstream merged into pci
2009-11-25 15:15:30 +01:00
4a8572e9d8
2009-11-24 Carles Pina i Estany <carles@pina.cat>
...
* conf/i386-coreboot.rmk (kernel_img_HEADERS): Add i18n.h.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-pc.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* gettext/gettex.c: Include <grub/i18n.h>.
* include/grub/misc.h (grub_gettext_dummy, grub_gettext): Move from
here ...
* include/grub/i18n.h: ... to here
* include/grub/i18n.h: ... to here.
* kern/misc.c: Include <grub/i18n.h>
(grub_gettext_dummy): Move above user.
2009-11-24 21:42:14 +00:00
4501250b6c
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrelpath.c: New file.
* conf/common.rmk (bin_UTILITIES): Add grub-mkrelpath.
(grub_mkrelpath_SOURCES): New variable.
* include/grub/util/misc.h: New function prototype.
* util/misc.c (make_system_path_relative_to_its_root): New function.
* util/grub-mkconfig_lib.in (bindir): New variable.
(grub_mkrelpath): Likewise.
(make_system_path_relative_to_its_root): Use grub-mkrelpath.
* util/probe.c (probe): Make the file path relative to its root.
Change a info message to use the GRUB path. Enable again the
check if we can read the file with GRUB facilities.
* util/i386/pc/grub-setup.c (setup): Make core.img path relative
to its root.
2009-11-24 15:00:25 +01:00
947fa16c8b
Important speedup by not redrawing too much
2009-11-24 07:17:18 +01:00
59f746dc5f
merged mainstream into crypto
2009-11-24 02:54:35 +01:00
3dcf83ba7d
merged mainstream into gfxmenu
2009-11-24 01:22:41 +01:00
b58fc33c4f
Merging with trunk
2009-11-23 20:34:42 +00:00
4996893238
definition fixes
2009-11-23 21:15:44 +01:00
f84b481b35
Cheery-pick grub-emu split from experimental (rev 1361)
...
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
* configure.ac: Detect all `emu' platforms. Define
GRUB_MACHINE_* macros in TARGET_CFLAGS. Remove
--enable-grub-emu logic. Disable include/grub/machine
symlink on `emu' platforms.
* genkernsyms.sh.in: Use @TARGET_CFLAGS@ during symbol generation.
* gensymlist.sh.in: Likewise.
* include/grub/i386/coreboot/machine.h: Remove file.
* include/grub/i386/efi/machine.h: Likewise.
* include/grub/i386/ieee1275/machine.h: Likewise.
* include/grub/i386/pc/machine.h: Likewise.
* include/grub/i386/qemu/machine.h: Likewise.
* include/grub/powerpc/ieee1275/machine.h: Likewise.
* include/grub/sparc64/ieee1275/machine.h: Likewise.
* include/grub/x86_64/efi/machine.h: Likewise.
* commands/acpi.c: Remove `<grub/machine/machine.h>'.
* commands/halt.c: Likewise.
* commands/reboot.c: Likewise.
* include/grub/autoefi.h: Likewise.
* include/grub/i386/at_keyboard.h: Likewise.
* include/grub/i386/kernel.h: Likewise.
* include/grub/i386/loader.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* kern/dl.c: Likewise.
* kern/i386/coreboot/init.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/usb_keyboard.c: Likewise.
* include/grub/time.h [!GRUB_MACHINE_EMU]: Remove
`<grub/machine/machine.h>'
[!GRUB_MACHINE_EMU] (GRUB_TICKS_PER_SECOND): New macro.
* util/misc.c: Remove `<grub/machine/machine.h>' and
`<grub/machine/time.h>'.
* Makefile.in (enable_grub_emu): Remove variable.
Include $(srcdir)/conf/any-emu.mk for the `emu' platform.
* conf/any-emu.rmk: New file.
* conf/common.rmk (grub_emu_init.lst, grub_emu_init.h)
(grub_emu_init.c): Move from here ...
* conf/any-emu.rmk: ... to here.
* conf/i386-coreboot.rmk (sbin_UTILITIES): Remove `grub-emu'.
(grub_emu_SOURCES, grub_emu_LDFLAGS): Move from here ...
* conf/any-emu.rmk: ... to here.
2009-11-23 15:31:54 +00:00
4efeab03dc
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/parser.h (grub_parser_register): Document need
of `name' parameter.
* normal/main.c (grub_normal_read_line): Simplify prompt string.
* script/sh/main.c (grub_sh_parser, GRUB_MOD_INIT(sh)): Rename
"sh" to "grub".
2009-11-23 15:23:55 +00:00
ea1dd8bf0a
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
...
* Makefile.in ($(srcdir)/po/$(PACKAGE).pot): Pass --keyword=N_ to
`$(XGETTEXT)'.
* include/grub/i18n.h (N_): New macro.
* util/mkisofs/mkisofs.h: Likewise.
* util/mkisofs/mkisofs.c (ld_options): Wrap all translatable strings
around N_().
(usage): Use gettext() to translate help strings when printing them.
2009-11-23 13:18:07 +00:00
5acc2aba78
merged mainline into PCI
2009-11-23 11:15:24 +01:00
e5fb78c684
This commit is the same than gettext08.patch (see mailing list)
2009-11-22 12:50:46 +00:00
0648f857ea
Different changes following Robert's email 20091121230904.GA29740@thorin
2009-11-22 11:49:54 +00:00
5afcd00788
merge mainstream into mips
2009-11-21 21:45:32 +01:00
6abdf8e20d
Fix for native miscompilation
2009-11-21 17:33:52 +01:00
d45b547fa6
merge trigonometry
2009-11-20 16:03:44 +01:00
d920a32ab6
gfxmenu import
2009-11-20 16:02:58 +01:00
bd86691a07
2009-11-20 Colin D Bennett <colin@gibibit.com>
...
* include/grub/misc.h (grub_iscntrl): New inline function.
(grub_isalnum): Likewise.
(grub_strtol): Likewise.
2009-11-20 15:09:48 +01:00
cbf97a87d9
* include/grub/menu_viewer.h (grub_menu_viewer_init): New prototype.
...
(grub_menu_viewer_should_return): Likewise.
* normal/main.c (GRUB_MOD_INIT (normal)): Call grub_menu_viewer_init.
* normal/menu_text.c (run_menu): Enable menu switching.
* normal/menu_viewer.c (should_return): New variable.
(menu_viewer_changed): Likewise.
(grub_menu_viewer_show_menu): Handle menu viewer changes.
(grub_menu_viewer_should_return): New function.
(menuviewer_write_hook): Likewise.
(grub_menu_viewer_init): Likewise.
2009-11-20 14:51:01 +01:00
ac3b7128d6
2009-11-20 Colin D Bennett <colin@gibibit.com>
...
* normal/menu_text.c (get_entry_number): Move from here ...
* normal/menu.c (get_entry_number): ... moved here.
* include/grub/menu.h (grub_menu_get_default_entry_index):
New prototype.
* normal/menu.c (grub_menu_get_default_entry_index): New function.
* normal/menu_text.c (run_menu): Use grub_menu_get_default_entry_index.
2009-11-20 14:45:33 +01:00
44883dfbd5
2009-11-19 Carles Pina i Estany <carles@pina.cat>
...
* include/grb/i18n_grub.h: same than i18n.h but for Grub Kernel.
* include/grub/misc.h: includes i18n_grub.h.
* normal/menu_text.c: gettize more strings.
* po/POTFILES: Update with new file.
* po/ca.po: New strings.
2009-11-19 21:43:09 +00:00
fbc5e89710
Syncs with trunk
2009-11-19 21:18:38 +00:00
b2f1e32746
2009-11-19 Felix Zielcke <fzielcke@z-51.de>
...
* include/grub/x86_64/io.h: New file.
2009-11-19 09:33:56 +01:00
769ae37bfd
Merge my gettext branch (gettext support in build system for GRUB utilities)
2009-11-17 20:23:06 +00:00
9a90f817a0
Move i18n declarations to their own file.
2009-11-17 09:52:08 +00:00
0e3c54a5c5
PBKDF2 passwords available
2009-11-24 02:36:21 +01:00
83bdecaf2a
2009-11-16 Robert Millan <rmh.grub@aybabtu.com>
...
Relicense multiboot.h, with RMS' blessing.
* include/multiboot.h: Change to X11 license.
2009-11-15 23:22:45 +00:00
228734ab02
MAX_PASSLEN based authentication
2009-11-15 23:36:42 +01:00
10e53efaee
crypto_memcmp
2009-11-15 23:31:27 +01:00
6e7d9194d1
Add HMAC and PBKDF2
2009-11-24 02:32:29 +01:00
c51a5caeab
2009-11-14 Colin D Bennet <colin@gibibit.com>
...
2009-11-14 Vladimir Serbinenko <phcoder@gmail.com>
Support for gfxterm in a window.
* include/grub/gfxterm.h: New file.
* include/grub/video.h (struct grub_video_rect): New declaration.
(grub_video_rect_t): Likewise.
* term/gfxterm.c (struct grub_gfxterm_window): New type.
(refcount): New variable.
(render_target): Likewise.
(window): Likewise.
(repaint_callback): Likewise.
(grub_virtual_screen_setup): Use 'render_target'.
(init_window): New function.
(grub_gfxterm_init_window): Likewise.
(grub_gfxterm_init): Check reference counter.
Use init_window.
(destroy_window): New function.
(grub_gfxterm_destroy_window): Likewise.
(grub_gfxterm_fini): Check reference counter.
Use destroy_window.
(redraw_screen_rect): Restore viewport.
Use 'render_target' and 'window'.
Call 'repaint_callback'.
(write_char): Use 'render_target'.
(draw_cursor): Likewise.
(scroll_up): Restore viewport.
Use 'render_target' and 'window'.
Call 'repaint_callback'.
(grub_gfxterm_cls): Likewise.
(grub_gfxterm_refresh): Use 'window'.
(grub_gfxterm_set_repaint_callback): New function.
(grub_gfxterm_background_image_cmd): Use 'window'.
(grub_gfxterm_get_term): New function.
(GRUB_MOD_INIT(term_gfxterm)): Set 'refcount' to 0.
Also-By: Vladimir Serbinenko <phcoder@gmail.com>
2009-11-15 00:03:03 +01:00
a9d407a81e
Reimported scaling
2009-11-20 10:46:30 +01:00
85536ab717
2009-11-14 Colin D Bennet <colin@gibibit.com>
...
Trigonometry support.
* include/grub/trig.h: New file.
* lib/trig.c: Likewise.
* maintainance/gentrigtables.py: Likewise.
* conf/common.rmk (pkglib_MODULES): Add trig.mod.
(trig_mod_SOURCES): New variable.
(trig_mod_CFLAGS): Likewise.
(trig_mod_LDFLAGS): Likewise.
2009-11-14 23:11:55 +01:00
bbe73b0995
Improved performance by not requiring updating swap in gfxterm
2009-11-14 17:59:11 +01:00
1f56d83788
Initial reimport of double buffering
2009-11-14 17:00:39 +01:00
df48e9e18d
REimport of videomask patch
2009-11-14 16:25:50 +01:00
203ffbfa31
Adds gettext support in Grub. Building system needs to be improved and maybe userland utilites improved.
...
YYYY-MM-DD Carles Pina i Estany <carles@pina.cat>
* Makefile.in: Add uptrans target to help to update .pot file
* conf/common.rmk: Add grub-gettext_lib target, dependency and SOURCES, CFLAGS, LDFLAGS
* kern/misc.c: Define grub_gettext symbol and add implement grub_gettext_dummy function
* po/TODO: Temporary file with instructions of what Makefile.in will do
* po/ca.po: Catalan translation stub
* include/grub/misc.h: Define macro _(char *s). Declare grub_gettext_dummy and grub_gettext
* gettext/gettext.c: New file with gettext implementation
* normal/menu.c (print_message): add _( ) to some strings
* util/grub.d/10_linux.in: include grub-gettext_lib file. For the Linux menuentry, call eval_gettext
* util/grub.d/00_header.in: add locale_prefix and gettext locale detection and setting up the access to the mo directory
* util/grub-mkconfig_lib.in: add get_locale_lang
* util/grub-gettext_lib.in: new file
2009-11-13 20:39:33 +00:00
8d0edf4abd
2009-11-13 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/multiboot.h (struct grub_multiboot_header): Move
from here ...
* include/multiboot.h (struct multiboot_header): ... to here. Update
all users.
* include/grub/multiboot.h (struct grub_multiboot_info): Move
from here ...
* include/multiboot.h (struct multiboot_info): ... to here. Update
all users.
* include/grub/multiboot.h (struct grub_multiboot_mmap_entry): Move
from here ...
* include/multiboot.h (struct multiboot_mmap_entry): ... to here.
Update all users.
* include/grub/multiboot.h (struct grub_mod_list): Move
from here ...
* include/multiboot.h (struct multiboot_mod_list): ... to here.
Update all users.
2009-11-13 13:34:51 +00:00
6944770e0c
2009-11-13 Robert Millan <rmh.grub@aybabtu.com>
...
* include/multiboot2.h (multiboot_word): Rename from this ...
(multiboot2_word): ... to this. Update all users.
(multiboot_header): Rename from this ...
(multiboot2_header): ... to this. Update all users.
(multiboot_tag_header): Rename from this ...
(multiboot2_tag_header): ... to this. Update all users.
(multiboot_tag_start): Rename from this ...
(multiboot2_tag_start): ... to this. Update all users.
(multiboot_tag_name): Rename from this ...
(multiboot2_tag_name): ... to this. Update all users.
(multiboot_tag_module): Rename from this ...
(multiboot2_tag_module): ... to this. Update all users.
(multiboot_tag_memory): Rename from this ...
(multiboot2_tag_memory): ... to this. Update all users.
(multiboot_tag_unused): Rename from this ...
(multiboot2_tag_unused): ... to this. Update all users.
(multiboot_tag_end): Rename from this ...
(multiboot2_tag_end): ... to this. Update all users.
2009-11-13 13:30:55 +00:00
f4c62ed6ed
Merge trunk
2009-11-13 14:15:36 +01:00
37f7911f01
Fix compilation error
2009-11-13 01:27:38 +01:00
fbf62978dc
Improved error handling
2009-11-13 00:27:04 +01:00
d944246c6a
Created crypto module. Moved some functions to it.
2009-11-12 22:40:14 +01:00
414f919237
Various cleanups and wrapper functions. Allocate disk id for LUKS.
2009-11-12 18:08:44 +01:00
a4bafc4710
First working cipher import
2009-11-10 20:51:22 +01:00
39f7c91b50
base for ciphers and digests
2009-11-10 01:01:11 +01:00
77546cfd8f
Restored missing headers
2009-11-09 22:07:57 +01:00
99145bdc4b
Merged with mainline
2009-11-09 21:58:49 +01:00
da547ac323
merged with mainstream
2009-11-09 21:16:25 +01:00
58806db847
Improvements in headers
2009-11-09 20:30:40 +01:00
1d3c6f1de7
Manually reimported XNU branch
2009-11-09 18:43:53 +01:00
3f02806841
Merged with trunk
2009-11-09 18:18:01 +01:00
c9b1ebc10b
First try to gcry glue
2009-11-09 17:13:17 +01:00
325f503783
2009-11-09 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/list.h (struct grub_named_list): Remove `const'
qualifier from `name'.
(struct grub_prio_list): Likewise.
2009-11-09 14:25:03 +00:00
c02a733496
Add a few files that were lost during transition from svn.
2009-11-08 16:57:31 +00:00
50ceeb7cb5
2009-11-04 Felix Zielcke <fzielcke@z-51.de>
...
* util//grub-mkconfig_lib.in (bindir): New variable.
(grub_mkrelpath): Likewise.
Properly set path variable. Use ${grub_mkrelpath} instead of
calling it directly.
2009-11-02 Felix Zielcke <fzielcke@z-51.de>
* util/probe.c (probe): Make the file path relative to its root.
Change a info message to use the GRUB path. Enable again the
check if we can read the file with GRUB facilities.
2009-11-01 Felix Zielcke <fzielcke@z-51.de>
* util/grub-mkrelpath.c: New file.
* conf/common.rmk (bin_UTILITIES): Add grub-mkrelpath.
(grub_mkrelpath_SOURCES): New variable.
* include/grub/util/misc.h: New function prototype.
* util/misc.c (make_system_path_relative_to_its_root): New function.
* util/grub-mkconfig_lib.in (make_system_path_relative_to_its_root):
Use grub-mkrelpath.
2009-11-08 01:49:15 +01:00
b0979f1191
Cleaned up CS5536 ATA compat support
2009-11-06 22:50:44 +01:00
02602a7002
Cleaned __gnu_local_gp handling
2009-11-06 17:37:31 +01:00
cc32314161
Removed memset declaration
2009-11-03 00:05:41 +01:00
811c0d8b5c
missing kbd files
2009-11-03 00:00:59 +01:00
1b4595cebf
AT keyboard support for Yeeloong
2009-11-02 23:57:09 +01:00
810d8224cd
PCI cleanup
2009-11-02 23:42:07 +01:00
6174923799
merged with upstream
2009-11-02 23:29:51 +01:00
95b9239e13
2009-10-28 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/misc.h: Stop checking for APPLE_CC.
2009-10-28 22:55:27 +00:00
083d16798e
2009-10-26 Robert Millan <rmh.grub@aybabtu.com>
...
* gensymlist.sh.in (COMPILE_TIME_ASSERT): Copy macro declaration
from here ...
* include/grub/misc.h (COMPILE_TIME_ASSERT): ... to here.
2009-10-26 18:04:37 +00:00
042484d78e
2009-10-25 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/fs.h [GRUB_UTIL] (struct grub_fs): Add
`reserved_first_sector' member.
* fs/ext2.c [GRUB_UTIL] (grub_ext2_fs): Initialize
`reserved_first_sector' to 1.
* fs/fat.c [GRUB_UTIL] (grub_fat_fs): Likewise.
* fs/ntfs.c [GRUB_UTIL] (grub_ntfs_fs): Likewise.
* fs/hfsplus.c [GRUB_UTIL] (grub_hfsplus_fs): Likewise.
* util/i386/pc/grub-setup.c (setup): Add safety check that probes for
filesystems which begin at first sector.
(options): New option --skip-fs-probe.
(main): Handle --skip-fs-probe and pass it to setup().
2009-10-25 15:23:48 +00:00
d64448a72c
2009-10-25 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/misc.h: Fix wrong evaluation of APPLE_CC.
(memset): Fix function prototype.
2009-10-25 15:14:25 +00:00
346e7fbedb
2009-10-25 Robert Millan <rmh.grub@aybabtu.com>
...
* configure.ac: Check for `__ashldi3', `__ashrdi3', `__lshrdi3',
`__trampoline_setup' and `__ucmpdi2'.
* include/grub/powerpc/libgcc.h: Only export symbols for functions
that libgcc provides.
2009-10-24 23:26:53 +00:00
cdb308b0e1
2009-10-25 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/powerpc/libgcc.h (memset): Remove function prototype.
* include/grub/sparc64/libgcc.h (memset): Likewise.
* include/grub/misc.h (memset, memcmp): New function prototypes.
2009-10-24 23:26:42 +00:00
a9b7a540bd
font preload
2009-10-24 12:44:42 +02:00
f0628ef04f
additional "machines"
2009-10-23 18:21:15 +02:00
270bd79ca7
kernel constants updated
2009-10-23 18:20:52 +02:00
061282ed11
bonito impl. I/O cleanup
2009-10-22 17:10:54 +02:00
0f8d98dad2
Merge branch 'pci' into mips
2009-10-22 14:32:09 +02:00
1e4f46c162
fixed pci base address
2009-10-19 18:08:44 +02:00
82b1f15b6b
declaration fix
2009-10-19 13:06:16 +02:00
e145631831
pci for yeeloong
2009-10-19 13:03:38 +02:00
b78f2e6e10
Merge branch 'mainline' into mips
2009-10-18 16:12:53 +02:00
4a1eefb623
Revert "simplify mipsel handling"
...
This reverts commit 3451c43f4938a20aee5a2c0d0fa17c29e40b989b.
Conflicts:
configure.ac
2009-10-18 15:06:47 +02:00
a9a6948ac3
grub as flash for qemu-gdium
2009-10-18 15:04:14 +02:00
ad17a401d6
new image format for mips. Asm part
2009-10-18 14:10:31 +02:00
1c2cdb26d3
yeeloong headers
2009-10-18 12:04:20 +02:00
cba2cae2f5
simplified serial
2009-10-18 11:49:09 +02:00
d71b572aea
empty loader.h added
2009-10-18 00:25:22 +02:00
fdb3c3acb0
simplify mipsel handling
2009-10-18 00:22:15 +02:00
81a642e8e2
linux.c
2009-10-16 17:40:59 +02:00
6b5886ba66
2009-10-15 Vladimir Serbinenko <phcoder@gmail.com>
...
Revert 2009-06-10 Pavel Roskin <proski@gnu.org>
* configure.ac: Put checks for __bswapsi2 and __bswapdi2.
* include/grub/powerpc/libgcc.h: Don't use weak attribute for all
exports.
* include/grub/sparc64/libgcc.h: Likewise. Use
preprocessor conditionals.
2009-10-15 11:55:06 +00:00
459fed4b98
pciaccess
2009-10-14 18:17:18 +02:00
325c8258e7
lspci works in grub-emu
2009-10-14 10:36:37 +02:00
3affd0ece8
libpci initial stuff
2009-10-14 10:11:59 +02:00
023593d766
relocator dor mips
2009-10-11 23:00:22 +02:00
6cb9ffbd75
Merge branch 'relocator' into mips
2009-10-11 22:21:28 +02:00
1540a08402
various fixes. MIPSsim support
2009-10-11 18:18:18 +02:00
Manoel R. Abranches
starous
Vladimir 'phcoder' Serbinenko
BVK Chaitanya
Colin Watson
Javier Martín
Aleš Nesrsta
Jiro SEKIBA
Christian Franke
Grégoire Sutre
carles
Robert Millan
Yves Blusseau
Felix Zielcke
Carles Pina i Estany
Vladimir 'phcoder' Serbinenko
Colin D Bennett
robertmh
phcoder
phcoder