[RFC PATCH] Add support for Intel Quark UART.
by David Woodhouse
This provides basic debug output on the Quark system, assuming that
*something* (i.e. coreboot or UEFI) has set it up in advance for us.
Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com>
---
I looked briefly at making this part of the CONFIG_DEBUG_SERIAL code,
and making that generic enough to handle I/O access *or* MMIO access
depending on what's present... but in fact that's probably overkill.
This isn't really limited to Quark; it would work with any 16550 device
wired up as MMIO32. But we can expand it as required, I think. No point
in starting off with the same functionality as the 5000-odd lines of the
Linux kernel's 8250_pci.c.
What do I need to do if called in 32-bit segmented mode? I'm guessing
that's not going to work right now...
src/Kconfig | 5 +++++
src/fw/csm.c | 2 ++
src/output.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 71 insertions(+)
diff --git a/src/Kconfig b/src/Kconfig
index a42ab2d..bdc2602 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -472,6 +472,11 @@ menu "Debugging"
Set to zero to disable debugging.
+ config DEBUG_QUARK_UART
+ depends on DEBUG_LEVEL != 0
+ bool "Debug to Quark UART #1"
+ default n
+
config DEBUG_SERIAL
depends on DEBUG_LEVEL != 0
bool "Serial port debugging"
diff --git a/src/fw/csm.c b/src/fw/csm.c
index dfb0d12..afd7ffe 100644
--- a/src/fw/csm.c
+++ b/src/fw/csm.c
@@ -280,6 +280,8 @@ handle_csm(struct bregs *regs)
if (!CONFIG_CSM)
return;
+ debug_serial_preinit();
+
dprintf(3, "handle_csm regs %p AX=%04x\n", regs, regs->ax);
pic_irqmask_write(PICMask);
diff --git a/src/output.c b/src/output.c
index b47625f..a90d350 100644
--- a/src/output.c
+++ b/src/output.c
@@ -17,6 +17,8 @@
#include "stacks.h" // call16_int
#include "string.h" // memset
#include "util.h" // ScreenAndDebug
+#include "hw/pci_regs.h" // PCI_VENDOR_ID, PCI_BASE_ADDRESS_0
+#include "hw/pci.h" // pci_config_readl
struct putcinfo {
void (*func)(struct putcinfo *info, char c);
@@ -31,9 +33,59 @@ struct putcinfo {
u16 DebugOutputPort VARFSEG = 0x402;
+static volatile u32 *quark_uart_addr = 0;
+
+extern void _cfunc32flat_quark_uart_preinit(void);
+extern void _cfunc32flat_quark_uart_putc(void);
+extern void _cfunc32flat_quark_uart_flush(void);
+
+void quark_uart_preinit(void)
+{
+ // debug port is bus 0, device 0x14, function 5.
+ u16 uart_bdf = pci_to_bdf(0, 0x14, 5);
+
+ // If it isn't a Quark UART...
+ if (pci_config_readl(uart_bdf, PCI_VENDOR_ID) != 0x09368086)
+ return;
+
+ u32 bar0 = pci_config_readl(uart_bdf, PCI_BASE_ADDRESS_0);
+ if (!(bar0 & 0xf))
+ quark_uart_addr = (void *)bar0;
+}
+
+void quark_uart_putc(char c)
+{
+ if (!quark_uart_addr)
+ return;
+
+ int timeout = DEBUG_TIMEOUT;
+ while ((quark_uart_addr[SEROFF_LSR] & 0x20) != 0x20)
+ if (!timeout--)
+ // Ran out of time.
+ return;
+ quark_uart_addr[SEROFF_DATA] = c;
+}
+
+void quark_uart_flush(void)
+{
+ if (!quark_uart_addr)
+ return;
+ int timeout = DEBUG_TIMEOUT;
+ while ((quark_uart_addr[SEROFF_LSR] & 0x60) != 0x60)
+ if (!timeout--)
+ // Ran out of time.
+ return;
+}
+
void
debug_serial_preinit(void)
{
+ if (CONFIG_DEBUG_QUARK_UART) {
+ if (MODE16)
+ call32(_cfunc32flat_quark_uart_preinit, 0, 0);
+ else
+ quark_uart_preinit();
+ }
if (!CONFIG_DEBUG_SERIAL)
return;
// setup for serial logging: 8N1
@@ -54,6 +106,12 @@ debug_serial_preinit(void)
static void
debug_serial(char c)
{
+ if (CONFIG_DEBUG_QUARK_UART) {
+ if (MODE16)
+ call32(_cfunc32flat_quark_uart_putc, c, 0);
+ else
+ quark_uart_putc(c);
+ }
if (!CONFIG_DEBUG_SERIAL)
return;
int timeout = DEBUG_TIMEOUT;
@@ -68,6 +126,12 @@ debug_serial(char c)
static void
debug_serial_flush(void)
{
+ if (CONFIG_DEBUG_QUARK_UART) {
+ if (MODE16)
+ call32(_cfunc32flat_quark_uart_flush, 0, 0);
+ else
+ quark_uart_flush();
+ }
if (!CONFIG_DEBUG_SERIAL)
return;
int timeout = DEBUG_TIMEOUT;
--
1.8.3.1
--
dwmw2
5 years, 2 months
seabios release planning
by Gerd Hoffmann
Hi,
qemu 1.7 is almost out of the door. I want update seabios early in the
1.8 devel cycle. Time to do resume the release planning since we've
scratched the idea to do a last-minute bios update for 1.7.
I'd like to see a seabios release from the master branch in december.
Ideally we'll put a prerelease into qemu before the final release so we
get some testing. We could either explicitly tag a release candidate or
just grab a snapshot for that.
Commit pending patches, enter seabios freeze, prepare seabios update for
qemu can be done next week I think. Then have 2-3 weeks freeze period,
tag final release before xmas. In case something doesn't go as planned
early january.
Pending patches:
* my ahci and pci patches sent this week.
* anything else?
How we wanna call the baby? 1.7.4? 1.8.0?
cheers,
Gerd
5 years, 8 months
[PATCH 0/6] pci patches
by Gerd Hoffmann
Hi,
Here is a collection of pci patches. The first two go clearly into
the bugfix category. Next two improve alignment a bit. Patch 5
adds some debug logging. Patch 6 adds etc/reserved-memory-end support.
cheers,
Gerd
Gerd Hoffmann (6):
pci: don't reorder entries when moving to 64bit list
pci: don't map usb host adapters above 4G
pci: align 64bit pci regions to 1G
pci: tweak + comment minimum allocations
pci: log pci windows
pci: map 64-bit BARs at location provided by emulator
src/fw/pciinit.c | 32 +++++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 7 deletions(-)
--
1.8.3.1
5 years, 8 months
[PATCH 0/3] ahci: 32bit mode patches
by Gerd Hoffmann
Hi,
The ahci driver has recently been changed to run completely in 32bit mode.
This is a followup patch series for this, removing real mode memory
access macros not needed any more and also moving data structures out
of real mode address space.
cheers,
Gerd
Gerd Hoffmann (3):
ahci: zap real mode macros
ahci: remote some parentheses
ahci: alloc structs in high memory, simplify realloc
src/hw/ahci.c | 101 ++++++++++++++++++++++++----------------------------------
1 file changed, 41 insertions(+), 60 deletions(-)
--
1.8.3.1
5 years, 8 months
[PATCH] add HDTV resolutions (1280x768, 1280x720, 1920x1080)
by Michael Tokarev
The same set were added to vgabios at version 0.7a.
Signed-off-by: Michael Tokarev <mjt(a)tls.msk.ru>
---
vgasrc/bochsvga.c | 9 +++++++++
1 file changed, 9 insertions(+)
V2: actually fixed 1280x720 mode
diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index b0ba1ec..35bd09d 100644
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -68,6 +68,9 @@ static struct bochsvga_mode
{ 0x14a, { MM_DIRECT, 1152, 864, 16, 8, 16, SEG_GRAPH } },
{ 0x14b, { MM_DIRECT, 1152, 864, 24, 8, 16, SEG_GRAPH } },
{ 0x14c, { MM_DIRECT, 1152, 864, 32, 8, 16, SEG_GRAPH } },
+ { 0x175, { MM_DIRECT, 1280, 768, 16, 8, 16, SEG_GRAPH } },
+ { 0x176, { MM_DIRECT, 1280, 768, 24, 8, 16, SEG_GRAPH } },
+ { 0x177, { MM_DIRECT, 1280, 768, 32, 8, 16, SEG_GRAPH } },
{ 0x178, { MM_DIRECT, 1280, 800, 16, 8, 16, SEG_GRAPH } },
{ 0x179, { MM_DIRECT, 1280, 800, 24, 8, 16, SEG_GRAPH } },
{ 0x17a, { MM_DIRECT, 1280, 800, 32, 8, 16, SEG_GRAPH } },
@@ -89,6 +92,12 @@ static struct bochsvga_mode
{ 0x18a, { MM_DIRECT, 2560, 1600, 16, 8, 16, SEG_GRAPH } },
{ 0x18b, { MM_DIRECT, 2560, 1600, 24, 8, 16, SEG_GRAPH } },
{ 0x18c, { MM_DIRECT, 2560, 1600, 32, 8, 16, SEG_GRAPH } },
+ { 0x18d, { MM_DIRECT, 1280, 720, 16, 8, 16, SEG_GRAPH } },
+ { 0x18e, { MM_DIRECT, 1280, 720, 24, 8, 16, SEG_GRAPH } },
+ { 0x18f, { MM_DIRECT, 1280, 720, 32, 8, 16, SEG_GRAPH } },
+ { 0x190, { MM_DIRECT, 1920, 1080, 16 8, 16, SEG_GRAPH } },
+ { 0x191, { MM_DIRECT, 1920, 1080, 24 8, 16, SEG_GRAPH } },
+ { 0x192, { MM_DIRECT, 1920, 1080, 32, 8, 16, SEG_GRAPH } },
};
static int is_bochsvga_mode(struct vgamode_s *vmode_g)
--
1.7.10.4
5 years, 8 months
[PATCH 5/5] vgabios: Work around lack of support for "calll" in x86emu emulation.
by Kevin O'Connor
Replace 32 bit call instructions with 16 bit call instructions in the
vgabios to workaround problems in old versions of x86emu. This change
allows fc13 and fc14 to boot. (Other x86emu emulation bugs still
prevent fc11 and fc12 from booting.)
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
scripts/vgafixup.py | 2 ++
vgasrc/vgaentry.S | 23 ++++++++++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/scripts/vgafixup.py b/scripts/vgafixup.py
index 52fb934..2493f35 100644
--- a/scripts/vgafixup.py
+++ b/scripts/vgafixup.py
@@ -28,6 +28,8 @@ def main():
out.append('retw $2\n')
elif sline == 'leave':
out.append('movl %ebp, %esp ; popl %ebp\n')
+ elif sline.startswith('call'):
+ out.append('pushw %ax ; callw' + sline[4:] + '\n')
else:
out.append(line)
infile.close()
diff --git a/vgasrc/vgaentry.S b/vgasrc/vgaentry.S
index d9fe05b..a65136d 100644
--- a/vgasrc/vgaentry.S
+++ b/vgasrc/vgaentry.S
@@ -44,17 +44,34 @@ _rom_header_signature:
* Entry points
****************************************************************/
+ // This macro is the same as ENTRY_ARG except the "calll"
+ // instruction is avoided to work around known issues in the
+ // emulation of some versions of x86emu.
+ .macro ENTRY_ARG_VGA cfunc
+ cli
+ cld
+ PUSHBREGS
+ movw %ss, %ax // Move %ss to %ds
+ movw %ax, %ds
+ movl %esp, %ebx // Backup %esp, then zero high bits
+ movzwl %sp, %esp
+ movl %esp, %eax // First arg is pointer to struct bregs
+ pushw %ax ; callw \cfunc
+ movl %ebx, %esp // Restore %esp (including high bits)
+ POPBREGS
+ .endm
+
DECLFUNC entry_104f05
entry_104f05:
- ENTRY_ARG vbe_104f05
+ ENTRY_ARG_VGA vbe_104f05
lretw
DECLFUNC _optionrom_entry
_optionrom_entry:
- ENTRY_ARG vga_post
+ ENTRY_ARG_VGA vga_post
lretw
DECLFUNC entry_10
entry_10:
- ENTRY_ARG handle_10
+ ENTRY_ARG_VGA handle_10
iretw
--
1.8.3.1
5 years, 8 months
[PATCH 4/5] vgabios: Avoid possible divide by zero in bochsvga_set_displaystart.
by Kevin O'Connor
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
vgasrc/bochsvga.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index a19eccb..6da9d5d 100644
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -212,6 +212,8 @@ bochsvga_set_displaystart(struct vgamode_s *vmode_g, int val)
if (GET_GLOBAL(dispi_found)) {
int bpp = vga_bpp(vmode_g);
int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8;
+ if (!linelength)
+ return 0;
dispi_write(VBE_DISPI_INDEX_X_OFFSET, (val % linelength) * 8 / bpp);
dispi_write(VBE_DISPI_INDEX_Y_OFFSET, val / linelength);
}
--
1.8.3.1
5 years, 8 months
[PATCH 3/5] vgabios: Add bochsvga "HDTV" resolutions.
by Kevin O'Connor
The same set of video modes were added to the "lgpl vgabios" in
release 0.7a.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
vgasrc/bochsvga.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index 27f7615..a19eccb 100644
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -69,6 +69,9 @@ static struct bochsvga_mode
{ 0x14a, { MM_DIRECT, 1152, 864, 16, 8, 16, SEG_GRAPH } },
{ 0x14b, { MM_DIRECT, 1152, 864, 24, 8, 16, SEG_GRAPH } },
{ 0x14c, { MM_DIRECT, 1152, 864, 32, 8, 16, SEG_GRAPH } },
+ { 0x175, { MM_DIRECT, 1280, 768, 16, 8, 16, SEG_GRAPH } },
+ { 0x176, { MM_DIRECT, 1280, 768, 24, 8, 16, SEG_GRAPH } },
+ { 0x177, { MM_DIRECT, 1280, 768, 32, 8, 16, SEG_GRAPH } },
{ 0x178, { MM_DIRECT, 1280, 800, 16, 8, 16, SEG_GRAPH } },
{ 0x179, { MM_DIRECT, 1280, 800, 24, 8, 16, SEG_GRAPH } },
{ 0x17a, { MM_DIRECT, 1280, 800, 32, 8, 16, SEG_GRAPH } },
@@ -90,6 +93,12 @@ static struct bochsvga_mode
{ 0x18a, { MM_DIRECT, 2560, 1600, 16, 8, 16, SEG_GRAPH } },
{ 0x18b, { MM_DIRECT, 2560, 1600, 24, 8, 16, SEG_GRAPH } },
{ 0x18c, { MM_DIRECT, 2560, 1600, 32, 8, 16, SEG_GRAPH } },
+ { 0x18d, { MM_DIRECT, 1280, 720, 16, 8, 16, SEG_GRAPH } },
+ { 0x18e, { MM_DIRECT, 1280, 720, 24, 8, 16, SEG_GRAPH } },
+ { 0x18f, { MM_DIRECT, 1280, 720, 32, 8, 16, SEG_GRAPH } },
+ { 0x190, { MM_DIRECT, 1920, 1080, 16, 8, 16, SEG_GRAPH } },
+ { 0x191, { MM_DIRECT, 1920, 1080, 24, 8, 16, SEG_GRAPH } },
+ { 0x192, { MM_DIRECT, 1920, 1080, 32, 8, 16, SEG_GRAPH } },
};
static int dispi_found VAR16 = 0;
--
1.8.3.1
5 years, 8 months
[PATCH 2/5] vgabios: Support custom fonts in vga framebuffer text writing.
by Kevin O'Connor
Obtain the font data from int 0x43 and int 0x1f, and obtain the font
height from the BDA. This enables application overrides for the font
data.
This patch also unifies the variable naming between the
planar/CGA/linear character writing functions and uses the same names
that the screen scrolling functions use.
This patch also optimizes the inner loop of the CGA font writing to
reduce overall stack usage.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
vgasrc/vgafb.c | 121 ++++++++++++++++++++++++++++++++-------------------------
1 file changed, 67 insertions(+), 54 deletions(-)
diff --git a/vgasrc/vgafb.c b/vgasrc/vgafb.c
index 815d54b..d94b88a 100644
--- a/vgasrc/vgafb.c
+++ b/vgasrc/vgafb.c
@@ -43,7 +43,7 @@ static void
scroll_pl4(struct vgamode_s *vmode_g, int nblines, int attr
, struct cursorpos ul, struct cursorpos lr)
{
- int cheight = GET_GLOBAL(vmode_g->cheight);
+ int cheight = GET_BDA(char_height);
int cwidth = 1;
int stride = GET_BDA(video_cols) * cwidth;
void *src_far, *dest_far;
@@ -79,7 +79,7 @@ static void
scroll_cga(struct vgamode_s *vmode_g, int nblines, int attr
, struct cursorpos ul, struct cursorpos lr)
{
- int cheight = GET_GLOBAL(vmode_g->cheight) / 2;
+ int cheight = GET_BDA(char_height) / 2;
int cwidth = GET_GLOBAL(vmode_g->depth);
int stride = GET_BDA(video_cols) * cwidth;
void *src_far, *dest_far;
@@ -117,7 +117,7 @@ static void
scroll_lin(struct vgamode_s *vmode_g, int nblines, int attr
, struct cursorpos ul, struct cursorpos lr)
{
- int cheight = 8;
+ int cheight = GET_BDA(char_height);
int cwidth = 8;
int stride = GET_BDA(video_cols) * cwidth;
void *src_far, *dest_far;
@@ -206,6 +206,21 @@ vgafb_scroll(int nblines, int attr, struct cursorpos ul, struct cursorpos lr)
* Read/write characters to screen
****************************************************************/
+static struct segoff_s
+get_font_data(u8 c)
+{
+ int char_height = GET_BDA(char_height);
+ struct segoff_s font;
+ if (char_height == 8 && c >= 128) {
+ font = GET_IVT(0x1f);
+ c -= 128;
+ } else {
+ font = GET_IVT(0x43);
+ }
+ font.offset += c * char_height;
+ return font;
+}
+
static void
write_gfx_char_pl4(struct vgamode_s *vmode_g
, struct cursorpos cp, struct carattr ca)
@@ -214,28 +229,20 @@ write_gfx_char_pl4(struct vgamode_s *vmode_g
if (cp.x >= nbcols)
return;
- u8 cheight = GET_GLOBAL(vmode_g->cheight);
- u8 *fdata_g;
- switch (cheight) {
- case 14:
- fdata_g = vgafont14;
- break;
- case 16:
- fdata_g = vgafont16;
- break;
- default:
- fdata_g = vgafont8;
- }
- u16 addr = cp.x + cp.y * cheight * nbcols;
- u16 src = ca.car * cheight;
+ struct segoff_s font = get_font_data(ca.car);
+ int cheight = GET_BDA(char_height);
+ int cwidth = 1;
+ int stride = nbcols * cwidth;
+ int addr = cp.y * cheight * stride + cp.x * cwidth;
int i;
for (i=0; i<4; i++) {
stdvga_planar4_plane(i);
u8 colors = ((ca.attr & (1<<i)) ? 0xff : 0x00);
int j;
for (j = 0; j < cheight; j++) {
- u8 *dest_far = (void*)(addr + j * nbcols);
- u8 pixels = colors & GET_GLOBAL(fdata_g[src + j]);
+ u8 *dest_far = (void*)(addr + j * stride);
+ u8 fontline = GET_FARVAR(font.seg, *(u8*)(font.offset+j));
+ u8 pixels = colors & fontline;
if (ca.attr & 0x80)
pixels ^= GET_FARVAR(SEG_GRAPH, *dest_far);
SET_FARVAR(SEG_GRAPH, *dest_far, pixels);
@@ -252,29 +259,31 @@ write_gfx_char_cga(struct vgamode_s *vmode_g
if (cp.x >= nbcols)
return;
- u8 *fdata_g = vgafont8;
- u8 bpp = GET_GLOBAL(vmode_g->depth);
- u16 addr = (cp.x * bpp) + cp.y * 320;
- u16 src = ca.car * 8;
- u8 i;
- for (i = 0; i < 8; i++) {
- u8 *dest_far = (void*)(addr + (i >> 1) * 80);
+ struct segoff_s font = get_font_data(ca.car);
+ int cheight = GET_BDA(char_height) / 2;
+ int cwidth = GET_GLOBAL(vmode_g->depth);
+ int stride = nbcols * cwidth;
+ int addr = cp.y * cheight * stride + cp.x * cwidth;
+ int i;
+ for (i = 0; i < cheight*2; i++) {
+ u8 *dest_far = (void*)(addr + (i >> 1) * stride);
if (i & 1)
dest_far += 0x2000;
- if (bpp == 1) {
+ u8 fontline = GET_FARVAR(font.seg, *(u8*)(font.offset+i));
+ if (cwidth == 1) {
u8 colors = (ca.attr & 0x01) ? 0xff : 0x00;
- u8 pixels = colors & GET_GLOBAL(fdata_g[src + i]);
+ u8 pixels = colors & fontline;
if (ca.attr & 0x80)
pixels ^= GET_FARVAR(SEG_GRAPH, *dest_far);
SET_FARVAR(SEG_CTEXT, *dest_far, pixels);
} else {
- u16 pixels = 0;
- u8 fontline = GET_GLOBAL(fdata_g[src + i]);
- int j;
- for (j = 0; j < 8; j++)
- if (fontline & (1<<j))
- pixels |= (ca.attr & 0x03) << (j*2);
- pixels = cpu_to_be16(pixels);
+ u16 fontline16 = ((fontline & 0xf0) << 4) | (fontline & 0x0f);
+ fontline16 = ((fontline16 & 0x0c0c) << 2) | (fontline16 & 0x0303);
+ fontline16 = ((fontline16 & 0x2222) << 1) | (fontline16 & 0x1111);
+ fontline16 |= fontline16<<1;
+ u16 colors = (((ca.attr & 0x01) ? 0x5555 : 0x0000)
+ | ((ca.attr & 0x02) ? 0xaaaa : 0x0000));
+ u16 pixels = cpu_to_be16(colors & fontline16);
if (ca.attr & 0x80)
pixels ^= GET_FARVAR(SEG_GRAPH, *(u16*)dest_far);
SET_FARVAR(SEG_CTEXT, *(u16*)dest_far, pixels);
@@ -291,14 +300,16 @@ write_gfx_char_lin(struct vgamode_s *vmode_g
if (cp.x >= nbcols)
return;
- u8 *fdata_g = vgafont8;
- u16 addr = cp.x * 8 + cp.y * nbcols * 64;
- u16 src = ca.car * 8;
- u8 i;
- for (i = 0; i < 8; i++) {
- u8 *dest_far = (void*)(addr + i * nbcols * 8);
- u8 fontline = GET_GLOBAL(fdata_g[src + i]);
- u8 j;
+ struct segoff_s font = get_font_data(ca.car);
+ int cheight = GET_BDA(char_height);
+ int cwidth = 8;
+ int stride = GET_BDA(video_cols) * cwidth;
+ int addr = cp.y * cheight * stride + cp.x * cwidth;
+ int i;
+ for (i = 0; i < cheight; i++) {
+ u8 *dest_far = (void*)(addr + i * stride);
+ u8 fontline = GET_FARVAR(font.seg, *(u8*)(font.offset+i));
+ int j;
for (j = 0; j < 8; j++) {
u8 pixel = (fontline & (0x80>>j)) ? ca.attr : 0x00;
SET_FARVAR(SEG_GRAPH, dest_far[j], pixel);
@@ -310,16 +321,16 @@ static void
write_text_char(struct vgamode_s *vmode_g
, struct cursorpos cp, struct carattr ca)
{
- // Compute the address
- u16 nbcols = GET_BDA(video_cols);
- void *address_far = (void*)(GET_BDA(video_pagesize) * cp.page
- + (cp.x + cp.y * nbcols) * 2);
-
+ int cheight = 1;
+ int cwidth = 2;
+ int stride = GET_BDA(video_cols) * cwidth;
+ int addr = cp.y * cheight * stride + cp.x * cwidth;
+ void *dest_far = (void*)(GET_BDA(video_pagesize) * cp.page + addr);
if (ca.use_attr) {
u16 dummy = (ca.attr << 8) | ca.car;
- SET_FARVAR(GET_GLOBAL(vmode_g->sstart), *(u16*)address_far, dummy);
+ SET_FARVAR(GET_GLOBAL(vmode_g->sstart), *(u16*)dest_far, dummy);
} else {
- SET_FARVAR(GET_GLOBAL(vmode_g->sstart), *(u8*)address_far, ca.car);
+ SET_FARVAR(GET_GLOBAL(vmode_g->sstart), *(u8*)dest_far, ca.car);
}
}
@@ -366,10 +377,12 @@ vgafb_read_char(struct cursorpos cp)
}
// Compute the address
- u16 nbcols = GET_BDA(video_cols);
- u16 *address_far = (void*)(GET_BDA(video_pagesize) * cp.page
- + (cp.x + cp.y * nbcols) * 2);
- u16 v = GET_FARVAR(GET_GLOBAL(vmode_g->sstart), *address_far);
+ int cheight = 1;
+ int cwidth = 2;
+ int stride = GET_BDA(video_cols) * cwidth;
+ int addr = cp.y * cheight * stride + cp.x * cwidth;
+ u16 *src_far = (void*)(GET_BDA(video_pagesize) * cp.page + addr);
+ u16 v = GET_FARVAR(GET_GLOBAL(vmode_g->sstart), *src_far);
struct carattr ca = {v, v>>8, 0};
return ca;
--
1.8.3.1
5 years, 8 months
[PATCH 1/5] vgabios: Load the DAC palette in "packed" modes on Cirrus and BochsVGA.
by Kevin O'Connor
This is a port of a patch applied to the "lgpl vgabios" tree (that was
released in its v0.7a release).
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
vgasrc/bochsvga.c | 13 ++++++-------
vgasrc/clext.c | 2 ++
vgasrc/stdvga.h | 1 +
vgasrc/stdvgamodes.c | 7 +++++++
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index 9425a82..27f7615 100644
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -318,14 +318,13 @@ bochsvga_set_mode(struct vgamode_s *vmode_g, int flags)
if (!GET_GLOBAL(dispi_found))
return -1;
- u8 depth = GET_GLOBAL(vmode_g->depth);
- if (depth == 4)
+ u8 memmodel = GET_GLOBAL(vmode_g->memmodel);
+ if (memmodel == MM_PLANAR)
stdvga_set_mode(stdvga_find_mode(0x6a), 0);
- if (depth == 8)
- // XXX load_dac_palette(3);
- ;
+ if (memmodel == MM_PACKED && !(flags & MF_NOPALETTE))
+ stdvga_set_packed_palette();
- dispi_write(VBE_DISPI_INDEX_BPP, depth);
+ dispi_write(VBE_DISPI_INDEX_BPP, GET_GLOBAL(vmode_g->depth));
u16 width = GET_GLOBAL(vmode_g->width);
u16 height = GET_GLOBAL(vmode_g->height);
dispi_write(VBE_DISPI_INDEX_XRES, width);
@@ -353,7 +352,7 @@ bochsvga_set_mode(struct vgamode_s *vmode_g, int flags)
stdvga_attr_mask(0x10, 0x00, 0x01);
stdvga_grdc_write(0x06, 0x05);
stdvga_sequ_write(0x02, 0x0f);
- if (depth >= 8) {
+ if (memmodel != MM_PLANAR) {
stdvga_crtc_mask(crtc_addr, 0x14, 0x00, 0x40);
stdvga_attr_mask(0x10, 0x00, 0x40);
stdvga_sequ_mask(0x04, 0x00, 0x08);
diff --git a/vgasrc/clext.c b/vgasrc/clext.c
index 93085cf..f7751a2 100644
--- a/vgasrc/clext.c
+++ b/vgasrc/clext.c
@@ -466,6 +466,8 @@ clext_set_mode(struct vgamode_s *vmode_g, int flags)
struct cirrus_mode_s *table_g = container_of(
vmode_g, struct cirrus_mode_s, info);
cirrus_switch_mode(table_g);
+ if (GET_GLOBAL(vmode_g->memmodel) == MM_PACKED && !(flags & MF_NOPALETTE))
+ stdvga_set_packed_palette();
if (!(flags & MF_LINEARFB))
cirrus_enable_16k_granularity();
if (!(flags & MF_NOCLEARMEM))
diff --git a/vgasrc/stdvga.h b/vgasrc/stdvga.h
index bb8b8d8..3685aba 100644
--- a/vgasrc/stdvga.h
+++ b/vgasrc/stdvga.h
@@ -50,6 +50,7 @@ void stdvga_list_modes(u16 seg, u16 *dest, u16 *last);
void stdvga_build_video_param(void);
void stdvga_override_crtc(int mode, u8 *crtc);
int stdvga_set_mode(struct vgamode_s *vmode_g, int flags);
+void stdvga_set_packed_palette(void);
// stdvgaio.c
u8 stdvga_pelmask_read(void);
diff --git a/vgasrc/stdvgamodes.c b/vgasrc/stdvgamodes.c
index dda35db..a97c85f 100644
--- a/vgasrc/stdvgamodes.c
+++ b/vgasrc/stdvgamodes.c
@@ -505,3 +505,10 @@ stdvga_set_mode(struct vgamode_s *vmode_g, int flags)
return 0;
}
+
+// Load the standard palette associated with 8bpp packed pixel vga modes.
+void
+stdvga_set_packed_palette(void)
+{
+ stdvga_dac_write(get_global_seg(), palette3, 0, sizeof(palette3) / 3);
+}
--
1.8.3.1
5 years, 8 months
