SeaBIOS

seabios@seabios.org

4 participants
3801 discussions

Re: [SeaBIOS] how sea bios set VGA bar address?
by Gerd Hoffmann 10 Nov '14

10 Nov '14

Hi, > so i wonder where in source code of seabios calculate PCI BAR address? src/fw/pciinit.c initializes all pci devices and assigns addresses to the bars. bars are sorted by size for best packing, so the addresses they end up depends on the size and also which other devices are present. > and also, i wonder why qemu's vga pci bar address is different from > virtualbox's vga pci bar address though > both of devices are classified as same 'vga' device(class id number : > 0x30) There is no need for it to have a fixed address. > (in Virtualbox, VGA PIC BAR ADDRESS always starts from e0000000 and it > is VBE standard) I doubt it is VBE standard. cheers, Gerd

1 0

how sea bios set VGA bar address?
by 유준봉 08 Nov '14

08 Nov '14

Hi SeaBios!! I'm qemu user and i want to modify qemu vga device to start BAR Address from 0xE0000000 As you know, Qemu uses SEABIOS as system bios but when i look into Qemu Debug console, right using command "info pci" then it just shows value for PCI BAR address : 0xf0000000 and it seems that VGA PCI BAR address change by the size of VGA RAM(VRAM) size (if VRAM is 128MB, BAR address = 0xf0000000, if it is 256MB, BAR address = 0xe0000000) It seems during booting time seabios calculate VGA PCI BAR address as 0xf000000 when its VRAM size is 128MB. so i wonder where in source code of seabios calculate PCI BAR address? and also, i wonder why qemu's vga pci bar address is different from virtualbox's vga pci bar address though both of devices are classified as same 'vga' device(class id number : 0x30) (in Virtualbox, VGA PIC BAR ADDRESS always starts from e0000000 and it is VBE standard)

1 0

[PATCH] edd: Fix buffer size field for EDD 3.x
by Kevin Wolf 07 Nov '14

07 Nov '14

The full 66 bytes of the EDD 3.x buffer were already filled, but the size field wasn't updated so that we would return that only the first 30 bytes of it are valid (like for 2.x). Fix the size field. Signed-off-by: Kevin Wolf <kwolf(a)redhat.com> --- src/block.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/block.c b/src/block.c index 7892be5..46afca0 100644 --- a/src/block.c +++ b/src/block.c @@ -339,6 +339,7 @@ fill_generic_edd(u16 seg, struct int13dpt_s *param_far, struct drive_s *drive_gf return DISK_RET_SUCCESS; // EDD 3.x + SET_FARVAR(seg, param_far->size, 66); SET_FARVAR(seg, param_far->key, 0xbedd); SET_FARVAR(seg, param_far->dpi_length, t13 ? 44 : 36); SET_FARVAR(seg, param_far->reserved1, 0); -- 1.8.3.1

2 3

Regression booting winxp under Xen.
by Ian Campbell 05 Nov '14

05 Nov '14

Xen's automated test system is reporting[1] that something between bfb7b58b3068 and 136d4ec190af (for reference the previous pass is[2]) has broken booting winxp under Xen with Seabios. Logs for one of the failures can be found at[3] (reached by following the email's link to [4] and clicking the header of a failing column). The VNC screenshot of the guest shows "Setup is inspecting your hardware configuration..." (at least for those which have such a screenshot, not sure why some don't). I've not investigated more thoroughly yes, just posting in case something obvious leaps out at someone. The automated test is currently bisecting the issue, once it is done I'll let you know the result. [1] http://lists.xen.org/archives/html/xen-devel/2014-10/msg03543.html [2] http://lists.xen.org/archives/html/xen-devel/2014-10/msg01993.html [3] http://www.chiark.greenend.org.uk/~xensrcts/logs/31223/test-amd64-i386-xl-q… [4] http://www.chiark.greenend.org.uk/~xensrcts/logs/31223/

2 4

[PATCH 1/4] vgabios: Only init BDA device details in init_bios_area()
by Kevin O'Connor 27 Oct '14

27 Oct '14

Don't set the device details when changing modes, and don't set mode details outside of mode setting. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- vgasrc/vgabios.c | 9 --------- vgasrc/vgainit.c | 19 ++++++++----------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 5fdb549..e2a4efc 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -326,15 +326,6 @@ vga_set_mode(int mode, int flags) SET_BDA(video_pagestart, 0x0000); SET_BDA(video_page, 0x00); - // FIXME We nearly have the good tables. to be reworked - SET_BDA(dcc_index, 0x08); // 8 is VGA should be ok for now - SET_BDA(video_savetable - , SEGOFF(get_global_seg(), (u32)&video_save_pointer_table)); - - // FIXME - SET_BDA(video_msr, 0x00); // Unavailable on vanilla vga, but... - SET_BDA(video_pal, 0x00); // Unavailable on vanilla vga, but... - // Set the ints 0x1F and 0x43 SET_IVT(0x1f, SEGOFF(get_global_seg(), (u32)&vgafont8[128 * 8])); diff --git a/vgasrc/vgainit.c b/vgasrc/vgainit.c index 5c76c5b..c323cf8 100644 --- a/vgasrc/vgainit.c +++ b/vgasrc/vgainit.c @@ -140,20 +140,17 @@ init_bios_area(void) // set 80x25 color (not clear from RBIL but usual) set_equipment_flags(0x30, 0x20); - // the default char height - SET_BDA(char_height, 0x10); - - // Clear the screen - SET_BDA(video_ctl, 0x60); - - // Set the basic screen we have - SET_BDA(video_switches, 0xf9); - // Set the basic modeset options SET_BDA(modeset_ctl, 0x51); - // Set the default MSR - SET_BDA(video_msr, 0x09); + // FIXME We nearly have the good tables. to be reworked + SET_BDA(dcc_index, 0x08); // 8 is VGA should be ok for now + SET_BDA(video_savetable + , SEGOFF(get_global_seg(), (u32)&video_save_pointer_table)); + + // FIXME + SET_BDA(video_msr, 0x00); // Unavailable on vanilla vga, but... + SET_BDA(video_pal, 0x00); // Unavailable on vanilla vga, but... } int VgaBDF VAR16 = -1; -- 1.9.3

1 4

[PATCH 1/4] Don't clobber %ax on ENTRY_INTO32 macro
by Kevin O'Connor 27 Oct '14

27 Oct '14

There's no need to clobber %ax in ENTRY_INTO32. Now that %eax isn't clobbered, use ENTRY_INTO32 in entry_csm. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/entryfuncs.S | 5 ++--- src/romlayout.S | 10 ++-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/entryfuncs.S b/src/entryfuncs.S index 679b1fc..8438604 100644 --- a/src/entryfuncs.S +++ b/src/entryfuncs.S @@ -135,10 +135,9 @@ .endm // Reset stack, transition to 32bit mode, and call a C function. - // Clobbers %ax .macro ENTRY_INTO32 cfunc - xorw %ax, %ax - movw %ax, %ss + xorw %dx, %dx + movw %dx, %ss movl $ BUILD_STACK_ADDR , %esp movl $ \cfunc , %edx jmp transition32 diff --git a/src/romlayout.S b/src/romlayout.S index cca4e43..4ebbdee 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -431,14 +431,8 @@ entry_csm: shll $4, %eax addl %esp, %eax - // Change to BUILD_STACK_ADDR stack - xorl %ebx, %ebx - movw %bx, %ss - movl $BUILD_STACK_ADDR, %esp - - // Jump to 32bit mode and call handle_csm(bregs) - movl $_cfunc32flat_handle_csm, %edx - jmp transition32 + // Change to BUILD_STACK_ADDR stack and call handle_csm(bregs) + ENTRY_INTO32 _cfunc32flat_handle_csm DECLFUNC __csm_return .code32 -- 1.9.3

1 4

[PATCH 00/11] USB interface cleanup and simplification
by Kevin O'Connor 27 Oct '14

27 Oct '14

The first six patches in this series make the internal usb naming convention a little more standard. (Use a "usb_" prefix on all exported functions and don't use camel case on exported functions.) The remaining five patches convert the USB controller drivers to a single pipe "realloc" function for managing pipe allocations and freeing. This should make it easier for xhci to implement pipe freeing (not implemented in this series). -Kevin Kevin O'Connor (11): usb: Rename ?hci_control() to ?hci_send_control() usb: Rename usb_getFrameExp() to usb_get_period() usb: Rename findEndPointDesc() to usb_find_desc() usb: Rename send_default_control() to usb_send_default_control() usb: Rename free_pipe() to usb_free_pipe() usb: Clarify usb freelist manipulations xhci: Change xhci_update_pipe() to xhci_realloc_pipe() and use for alloc too uhci: Export uhci_realloc_pipe() instead of uhci_alloc_pipe() ohci: Export ohci_realloc_pipe() instead of ohci_alloc_pipe() ehci: Export ehci_realloc_pipe() instead of ehci_alloc_pipe() usb: Use usb_realloc_pipe for pipe alloc, update, and free. src/hw/usb-ehci.c | 17 +++++---- src/hw/usb-ehci.h | 9 +++-- src/hw/usb-hid.c | 6 +-- src/hw/usb-hub.c | 8 ++-- src/hw/usb-msc.c | 10 ++--- src/hw/usb-ohci.c | 17 +++++---- src/hw/usb-ohci.h | 9 +++-- src/hw/usb-uas.c | 8 ++-- src/hw/usb-uhci.c | 17 +++++---- src/hw/usb-uhci.h | 9 +++-- src/hw/usb-xhci.c | 18 ++++++--- src/hw/usb-xhci.h | 12 +++--- src/hw/usb.c | 109 +++++++++++++++++++++++++++++------------------------- src/hw/usb.h | 22 ++++++----- 14 files changed, 149 insertions(+), 122 deletions(-) -- 1.9.3

1 12

[PATCH] vgabios: Add software cursor capability
by Kevin O'Connor 23 Oct '14

23 Oct '14

Add mechanism for drawing a cursor to the framebuffer to implement a cursor in software. The timer interrupt is "hooked" so that the cursor can blink. This can be useful for "coreboot native vga". Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- This is similar to the software cursor patches I sent earlier in the week. This time I've used the timer interrupt to both improve the drawing speed and to enable cursor blinking. This version of the patch also creates a small underline cursor instead of inverting the entire character cell. The series is also available at: https://github.com/KevinOConnor/seabios/tree/testing --- vgasrc/Kconfig | 5 +++++ vgasrc/vgabios.c | 13 ++++++++--- vgasrc/vgabios.h | 6 +++++- vgasrc/vgaentry.S | 30 ++++++++++++++++++++++++++ vgasrc/vgafb.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ vgasrc/vgainit.c | 34 +++++++++++++++++++++++++++++ 6 files changed, 148 insertions(+), 4 deletions(-) diff --git a/vgasrc/Kconfig b/vgasrc/Kconfig index 6474c22..5f3cc9d 100644 --- a/vgasrc/Kconfig +++ b/vgasrc/Kconfig @@ -51,6 +51,7 @@ menu "VGA ROM" depends on COREBOOT bool "coreboot linear framebuffer" select VGA_EMULATE_TEXTATTR + select VGA_SOFTWARE_CURSOR help Build support for a vgabios wrapper around video devices initialized using coreboot native vga init. @@ -89,6 +90,10 @@ menu "VGA ROM" help Try to emulate text mode attributes when writing text in graphics mode. + config VGA_SOFTWARE_CURSOR + bool + help + Emulate a cursor by modifying the framebuffer. config VGA_ALLOCATE_EXTRA_STACK depends on BUILD_VGABIOS diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 786c009..5fdb549 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -51,7 +51,7 @@ calc_page_size(u8 memmodel, u16 width, u16 height) } // Determine cursor shape (taking into account possible cursor scaling) -static u16 +u16 get_cursor_shape(void) { u16 cursor_type = GET_BDA(cursor_type); @@ -74,6 +74,7 @@ get_cursor_shape(void) static void set_cursor_shape(u16 cursor_type) { + vgafb_set_swcursor(0); SET_BDA(cursor_type, cursor_type); if (CONFIG_VGA_STDVGA_PORTS) stdvga_set_cursor_shape(get_cursor_shape()); @@ -88,6 +89,8 @@ set_cursor_pos(struct cursorpos cp) if (page > 7) return; + vgafb_set_swcursor(0); + // Bios cursor pos SET_BDA(cursor_pos[page], (y << 8) | x); @@ -103,7 +106,7 @@ set_cursor_pos(struct cursorpos cp) stdvga_set_cursor_pos((int)text_address(cp)); } -static struct cursorpos +struct cursorpos get_cursor_pos(u8 page) { if (page == 0xff) @@ -129,6 +132,8 @@ set_active_page(u8 page) if (!vmode_g) return; + vgafb_set_swcursor(0); + // Calculate memory address of start of page struct cursorpos cp = {0, 0, page}; int address = (int)text_address(cp); @@ -282,6 +287,8 @@ vga_set_mode(int mode, int flags) if (!vmode_g) return VBE_RETURN_STATUS_FAILED; + vgafb_set_swcursor(0); + int ret = vgahw_set_mode(vmode_g, flags); if (ret) return ret; @@ -305,7 +312,7 @@ vga_set_mode(int mode, int flags) int cwidth = GET_GLOBAL(vmode_g->cwidth); SET_BDA(video_cols, width / cwidth); SET_BDA(video_rows, (height / cheight) - 1); - SET_BDA(cursor_type, 0x0000); + SET_BDA(cursor_type, CONFIG_VGA_SOFTWARE_CURSOR ? 0x0607 : 0x0000); } SET_BDA(video_pagesize, calc_page_size(memmodel, width, height)); SET_BDA(crtc_address, CONFIG_VGA_STDVGA_PORTS ? stdvga_get_crtc() : 0); diff --git a/vgasrc/vgabios.h b/vgasrc/vgabios.h index 0ec4a8e..98dc3cd 100644 --- a/vgasrc/vgabios.h +++ b/vgasrc/vgabios.h @@ -84,7 +84,8 @@ struct vga_bda_s { u16 vgamode_offset; } PACKED; -#define BF_PM_MASK 0x0f +#define BF_PM_MASK 0x0f +#define BF_SWCURSOR 0x10 #define GET_BDA_EXT(var) \ GET_FARVAR(SEG_BDA, ((struct vga_bda_s *)VGA_CUSTOM_BDA)->var) @@ -117,6 +118,8 @@ struct cursorpos { }; int vga_bpp(struct vgamode_s *vmode_g); u16 calc_page_size(u8 memmodel, u16 width, u16 height); +u16 get_cursor_shape(void); +struct cursorpos get_cursor_pos(u8 page); int bda_save_restore(int cmd, u16 seg, void *data); struct vgamode_s *get_current_mode(void); int vga_set_mode(int mode, int flags); @@ -133,6 +136,7 @@ void vgafb_write_char(struct cursorpos cp, struct carattr ca); struct carattr vgafb_read_char(struct cursorpos cp); void vgafb_write_pixel(u8 color, u16 x, u16 y); u8 vgafb_read_pixel(u16 x, u16 y); +void vgafb_set_swcursor(int enable); // vbe.c extern u32 VBE_total_memory; diff --git a/vgasrc/vgaentry.S b/vgasrc/vgaentry.S index 5d45380..c05502d 100644 --- a/vgasrc/vgaentry.S +++ b/vgasrc/vgaentry.S @@ -133,3 +133,33 @@ entry_10_extrastack: pushl BREGS_code(%eax) RESTOREBREGS_DSEAX iretw + + // Timer irq handling + DECLFUNC entry_timer_hook +entry_timer_hook: + ENTRY handle_timer_hook + ljmpw *%cs:Timer_Hook_Resume + + // Timer irq handling on extra stack + DECLFUNC entry_timer_hook_extrastack +entry_timer_hook_extrastack: + cli + cld + pushw %ds // Set %ds:%eax to space on ExtraStack + pushl %eax + movw %cs:ExtraStackSeg, %ds + movl $(CONFIG_VGA_EXTRA_STACK_SIZE-BREGS_size-8), %eax + SAVEBREGS_POP_DSEAX + movl %esp, BREGS_size(%eax) + movw %ss, BREGS_size+4(%eax) + + movw %ds, %dx // Setup %ss/%esp and call function + movw %dx, %ss + movl %eax, %esp + calll handle_timer_hook + + movl %esp, %eax // Restore registers and return + movw BREGS_size+4(%eax), %ss + movl BREGS_size(%eax), %esp + RESTOREBREGS_DSEAX + ljmpw *%cs:Timer_Hook_Resume diff --git a/vgasrc/vgafb.c b/vgasrc/vgafb.c index 9652683..2260253 100644 --- a/vgasrc/vgafb.c +++ b/vgasrc/vgafb.c @@ -454,6 +454,30 @@ gfx_write_char(struct vgamode_s *vmode_g } } +// Draw/undraw a cursor on the framebuffer by xor'ing the cursor cell +void +gfx_set_swcursor(struct vgamode_s *vmode_g, int enable + , struct cursorpos cp, u16 cursor_type) +{ + u8 start = cursor_type >> 8, end = (cursor_type & 0xff) + 1; + struct gfx_op op; + init_gfx_op(&op, vmode_g); + op.x = cp.x * 8; + int cheight = GET_BDA(char_height); + op.y = cp.y * cheight + start; + + int i; + for (i = start; i < cheight && i < end; i++, op.y++) { + op.op = GO_READ8; + handle_gfx_op(&op); + int j; + for (j = 0; j < 8; j++) + op.pixels[j] ^= 0x07; + op.op = GO_WRITE8; + handle_gfx_op(&op); + } +} + // Set the pixel at the given position. void vgafb_write_pixel(u8 color, u16 x, u16 y) @@ -461,6 +485,7 @@ vgafb_write_pixel(u8 color, u16 x, u16 y) struct vgamode_s *vmode_g = get_current_mode(); if (!vmode_g) return; + vgafb_set_swcursor(0); struct gfx_op op; init_gfx_op(&op, vmode_g); @@ -485,6 +510,7 @@ vgafb_read_pixel(u16 x, u16 y) struct vgamode_s *vmode_g = get_current_mode(); if (!vmode_g) return 0; + vgafb_set_swcursor(0); struct gfx_op op; init_gfx_op(&op, vmode_g); @@ -518,6 +544,7 @@ vgafb_move_chars(struct cursorpos dest struct vgamode_s *vmode_g = get_current_mode(); if (!vmode_g) return; + vgafb_set_swcursor(0); if (GET_GLOBAL(vmode_g->memmodel) != MM_TEXT) { gfx_move_chars(vmode_g, dest, src, movesize); @@ -538,6 +565,7 @@ vgafb_clear_chars(struct cursorpos dest struct vgamode_s *vmode_g = get_current_mode(); if (!vmode_g) return; + vgafb_set_swcursor(0); if (GET_GLOBAL(vmode_g->memmodel) != MM_TEXT) { gfx_clear_chars(vmode_g, dest, ca, clearsize); @@ -557,6 +585,7 @@ vgafb_write_char(struct cursorpos cp, struct carattr ca) struct vgamode_s *vmode_g = get_current_mode(); if (!vmode_g) return; + vgafb_set_swcursor(0); if (GET_GLOBAL(vmode_g->memmodel) != MM_TEXT) { gfx_write_char(vmode_g, cp, ca); @@ -579,6 +608,7 @@ vgafb_read_char(struct cursorpos cp) struct vgamode_s *vmode_g = get_current_mode(); if (!vmode_g) goto fail; + vgafb_set_swcursor(0); if (GET_GLOBAL(vmode_g->memmodel) != MM_TEXT) { // FIXME gfx mode @@ -595,3 +625,37 @@ fail: ; struct carattr ca2 = {0, 0, 0}; return ca2; } + +// Draw/undraw a cursor on the screen +void +vgafb_set_swcursor(int enable) +{ + if (!CONFIG_VGA_SOFTWARE_CURSOR) + return; + u8 flags = GET_BDA_EXT(flags); + if (!!(flags & BF_SWCURSOR) == enable) + // Already in requested mode. + return; + struct vgamode_s *vmode_g = get_current_mode(); + if (!vmode_g) + return; + struct cursorpos cp = get_cursor_pos(0xff); + u16 cursor_type = get_cursor_shape(); + if (cp.x >= GET_BDA(video_cols) || cp.y > GET_BDA(video_rows) + || cursor_type >= 0x2000) + // Cursor not visible + return; + + SET_BDA_EXT(flags, (flags & ~BF_SWCURSOR) | (enable ? BF_SWCURSOR : 0)); + + if (GET_GLOBAL(vmode_g->memmodel) != MM_TEXT) { + gfx_set_swcursor(vmode_g, enable, cp, cursor_type); + return; + } + + // In text mode, swap foreground and background attributes for cursor + void *dest_far = text_address(cp) + 1; + u8 attr = GET_FARVAR(GET_GLOBAL(vmode_g->sstart), *(u8*)dest_far); + attr = (attr >> 4) | (attr << 4); + SET_FARVAR(GET_GLOBAL(vmode_g->sstart), *(u8*)dest_far, attr); +} diff --git a/vgasrc/vgainit.c b/vgasrc/vgainit.c index 9d6dd1e..5c76c5b 100644 --- a/vgasrc/vgainit.c +++ b/vgasrc/vgainit.c @@ -98,6 +98,38 @@ allocate_extra_stack(void) /**************************************************************** + * Timer hook + ****************************************************************/ + +struct segoff_s Timer_Hook_Resume VAR16 VISIBLE16; + +void VISIBLE16 +handle_timer_hook(void) +{ + if (!CONFIG_VGA_SOFTWARE_CURSOR) + return; + vgafb_set_swcursor(GET_BDA(timer_counter) % 18 < 9); +} + +static void +hook_timer_irq(void) +{ + if (!CONFIG_VGA_SOFTWARE_CURSOR) + return; + extern void entry_timer_hook(void); + extern void entry_timer_hook_extrastack(void); + struct segoff_s oldirq = GET_IVT(0x08); + struct segoff_s newirq = SEGOFF(get_global_seg(), (u32)entry_timer_hook); + if (GET_GLOBAL(ExtraStackSeg)) + newirq = SEGOFF(get_global_seg(), (u32)entry_timer_hook_extrastack); + dprintf(1, "Hooking hardware timer irq (old=%x new=%x)\n" + , oldirq.segoff, newirq.segoff); + SET_VGA(Timer_Hook_Resume, oldirq); + SET_IVT(0x08, newirq); +} + + +/**************************************************************** * VGA post ****************************************************************/ @@ -164,6 +196,8 @@ vga_post(struct bregs *regs) allocate_extra_stack(); + hook_timer_irq(); + SET_VGA(HaveRunInit, 1); // Fixup checksum -- 1.9.3

1 0

[PATCH] vgabios: Rename vbe_flags to flags
by Kevin O'Connor 23 Oct '14

23 Oct '14

Allow the custom bda field vbe_flags to be used for flags outside of vbe. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- vgasrc/vbe.c | 7 ++++--- vgasrc/vgabios.h | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c index 06ec22e..e2aeced 100644 --- a/vgasrc/vbe.c +++ b/vgasrc/vbe.c @@ -381,11 +381,12 @@ vbe_104f10(struct bregs *regs) case 0x00: regs->bx = 0x0f30; break; - case 0x01: - SET_BDA_EXT(vbe_flag, regs->bh); + case 0x01: ; + u8 flags = GET_BDA_EXT(flags); + SET_BDA_EXT(flags, (flags & ~BF_PM_MASK) | (regs->bh & BF_PM_MASK)); break; case 0x02: - regs->bh = GET_BDA_EXT(vbe_flag); + regs->bh = GET_BDA_EXT(flags) & BF_PM_MASK; break; default: regs->ax = 0x014f; diff --git a/vgasrc/vgabios.h b/vgasrc/vgabios.h index fc8d45a..0ec4a8e 100644 --- a/vgasrc/vgabios.h +++ b/vgasrc/vgabios.h @@ -79,11 +79,13 @@ struct gfx_op { #define VGA_CUSTOM_BDA 0xb9 struct vga_bda_s { - u8 vbe_flag; + u8 flags; u16 vbe_mode; u16 vgamode_offset; } PACKED; +#define BF_PM_MASK 0x0f + #define GET_BDA_EXT(var) \ GET_FARVAR(SEG_BDA, ((struct vga_bda_s *)VGA_CUSTOM_BDA)->var) #define SET_BDA_EXT(var, val) \ -- 1.9.3

1 0

[PATCH 1/2] vgabios: Set cursor shape fixes
by Kevin O'Connor 23 Oct '14

23 Oct '14

The "cursor scaling" mode is determined by the first bit of the video_ctl bda value, not the modeset_ctl value. Also, on a set_scan_lines() call, the shape should be set to lines-3/lines-2 and the shape must be set after char_height has been updated. The existing cursor shape code matches the legacy "lgpl vgabios", but the behavior doesn't match bios documentation nor observations with an ati vga bios. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- vgasrc/vgabios.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 8ec6aa6..47bf581 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -62,9 +62,9 @@ set_cursor_shape(u8 start, u8 end) if (!CONFIG_VGA_STDVGA_PORTS) return; - u8 modeset_ctl = GET_BDA(modeset_ctl); + u8 emulate_cursor = (GET_BDA(video_ctl) & 1) == 0; u16 cheight = GET_BDA(char_height); - if ((modeset_ctl & 0x01) && (cheight > 8) && (end < 8) && (start < 0x20)) { + if (emulate_cursor && (cheight > 8) && (end < 8) && (start < 0x20)) { if (end != (start + 1)) start = ((start + 1) * cheight / 8) - 1; else @@ -79,7 +79,6 @@ get_cursor_shape(u8 page) { if (page > 7) return 0; - // FIXME should handle VGA 14/16 lines return GET_BDA(cursor_type); } @@ -117,7 +116,6 @@ get_cursor_pos(u8 page) struct cursorpos cp = { 0, 0, 0xfe }; return cp; } - // FIXME should handle VGA 14/16 lines u16 xy = GET_BDA(cursor_pos[page]); struct cursorpos cp = {xy, xy>>8, page}; return cp; @@ -153,16 +151,16 @@ static void set_scan_lines(u8 lines) { stdvga_set_scan_lines(lines); - if (lines == 8) - set_cursor_shape(0x06, 0x07); - else - set_cursor_shape(lines - 4, lines - 3); SET_BDA(char_height, lines); u16 vde = stdvga_get_vde(); u8 rows = vde / lines; SET_BDA(video_rows, rows - 1); u16 cols = GET_BDA(video_cols); SET_BDA(video_pagesize, calc_page_size(MM_TEXT, cols, rows)); + if (lines == 8) + set_cursor_shape(0x06, 0x07); + else + set_cursor_shape(lines - 3, lines - 2); } @@ -981,9 +979,7 @@ handle_101233(struct bregs *regs) static void handle_101234(struct bregs *regs) { - u8 v = (regs->al & 0x01) ^ 0x01; - u8 v2 = GET_BDA(modeset_ctl) & ~0x01; - SET_BDA(modeset_ctl, v | v2); + SET_BDA(video_ctl, (GET_BDA(video_ctl) & ~0x01) | (regs->al & 0x01)); regs->al = 0x12; } -- 1.9.3

1 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS