vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge trunk

Browse source
This commit is contained in:
Colin Watson 2011-05-18 16:53:36 +01:00
commit e806ce60ee
431 changed files with 17605 additions and 2568 deletions
Download patch file Download diff file Expand all files Collapse all files

4
grub-core/video/bitmap.c
View file

@ -23,6 +23,8 @@
#include <grub/mm.h>
#include <grub/misc.h>
GRUB_MOD_LICENSE ("GPLv3+");
/* List of bitmap readers registered to system. */
static grub_video_bitmap_reader_t bitmap_readers_list;
@ -177,7 +179,7 @@ match_extension (const char *filename, const char *ext)
pos -= ext_len;
return grub_strcmp (filename + pos, ext) == 0;
return grub_strcasecmp (filename + pos, ext) == 0;
}
/* Loads bitmap using registered bitmap readers. */

3
grub-core/video/bitmap_scale.c
View file

@ -23,6 +23,9 @@
#include <grub/bitmap.h>
#include <grub/bitmap_scale.h>
#include <grub/types.h>
#include <grub/dl.h>
GRUB_MOD_LICENSE ("GPLv3+");
/* Prototypes for module-local functions. */
static grub_err_t scale_nn (struct grub_video_bitmap *dst,

5
grub-core/video/bochs.c
View file

@ -28,6 +28,8 @@
#include <grub/pci.h>
#include <grub/vga.h>
GRUB_MOD_LICENSE ("GPLv3+");
static struct
{
struct grub_video_mode_info mode_info;
@ -199,7 +201,8 @@ grub_video_bochs_set_palette (unsigned int start, unsigned int count,
static grub_err_t
grub_video_bochs_setup (unsigned int width, unsigned int height,
unsigned int mode_type, unsigned int mode_mask)
grub_video_mode_type_t mode_type,
grub_video_mode_type_t mode_mask)
{
int depth;
grub_err_t err;

5
grub-core/video/cirrus.c
View file

@ -28,6 +28,8 @@
#include <grub/pci.h>
#include <grub/vga.h>
GRUB_MOD_LICENSE ("GPLv3+");
static struct
{
struct grub_video_mode_info mode_info;
@ -235,7 +237,8 @@ grub_video_cirrus_set_palette (unsigned int start, unsigned int count,
static grub_err_t
grub_video_cirrus_setup (unsigned int width, unsigned int height,
unsigned int mode_type, unsigned int mode_mask)
grub_video_mode_type_t mode_type,
grub_video_mode_type_t mode_mask)
{
int depth;
grub_err_t err;

2
grub-core/video/efi_gop.c
View file

@ -29,6 +29,8 @@
#include <grub/efi/efi.h>
#include <grub/efi/graphics_output.h>
GRUB_MOD_LICENSE ("GPLv3+");
static grub_efi_guid_t graphics_output_guid = GRUB_EFI_GOP_GUID;
static struct grub_efi_gop *gop;
static unsigned old_mode;

2
grub-core/video/efi_uga.c
View file

@ -30,6 +30,8 @@
#include <grub/efi/uga_draw.h>
#include <grub/pci.h>
GRUB_MOD_LICENSE ("GPLv3+");
static grub_efi_guid_t uga_draw_guid = GRUB_EFI_UGA_DRAW_GUID;
static struct grub_efi_uga_draw_protocol *uga;
static grub_uint32_t uga_fb;

2
grub-core/video/emu/sdl.c
View file

@ -27,6 +27,8 @@
#include <grub/video_fb.h>
#include <SDL/SDL.h>
GRUB_MOD_LICENSE ("GPLv3+");
static SDL_Surface *window = 0;
static struct grub_video_render_target *sdl_render_target;
static struct grub_video_mode_info mode_info;

22
grub-core/video/fb/video_fb.c
View file

@ -24,6 +24,9 @@
#include <grub/fbfill.h>
#include <grub/fbutil.h>
#include <grub/bitmap.h>
#include <grub/dl.h>
GRUB_MOD_LICENSE ("GPLv3+");
static struct
{
@ -1445,13 +1448,16 @@ grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask,
GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED,
0))
{
/* It was much nicer with the cast directly at function call but
some older gcc versions don't accept it properly.*/
void *tmp = (void *) page0_ptr;
mode_info->mode_type |= (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
| GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
err = grub_video_fb_doublebuf_blit_init (&framebuffer.front_target,
&framebuffer.back_target,
*mode_info,
(void *) page0_ptr);
tmp);
if (!err)
{
@ -1505,6 +1511,20 @@ grub_video_fb_get_info_and_fini (struct grub_video_mode_info *mode_info,
{
grub_memcpy (mode_info, &(framebuffer.front_target->mode_info),
sizeof (*mode_info));
/* We are about to load a kernel. Switch back to page zero, since some
kernel drivers expect that. */
if ((mode_info->mode_type & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED)
&& framebuffer.set_page && framebuffer.displayed_page != 0)
{
/* Ensure both pages are exactly in sync. */
grub_memcpy (framebuffer.back_target->data,
framebuffer.front_target->data,
framebuffer.back_target->mode_info.pitch
* framebuffer.back_target->mode_info.height);
grub_video_swap_buffers ();
}
*framebuf = framebuffer.front_target->data;
grub_video_fb_fini ();

5
grub-core/video/i386/pc/vbe.c
View file

@ -30,6 +30,8 @@
#include <grub/video.h>
#include <grub/machine/int.h>
GRUB_MOD_LICENSE ("GPLv3+");
static int vbe_detected = -1;
static struct grub_vbe_info_block controller_info;
@ -793,7 +795,8 @@ grub_video_vbe_iterate (int (*hook) (const struct grub_video_mode_info *info))
static grub_err_t
grub_video_vbe_setup (unsigned int width, unsigned int height,
unsigned int mode_type, unsigned int mode_mask)
grub_video_mode_type_t mode_type,
grub_video_mode_type_t mode_mask)
{
grub_uint16_t *p;
struct grub_vbe_mode_info_block vbe_mode_info;

5
grub-core/video/i386/pc/vga.c
View file

@ -30,6 +30,8 @@
#include <grub/misc.h>
#include <grub/vga.h>
GRUB_MOD_LICENSE ("GPLv3+");
#define VGA_WIDTH 640
#define VGA_HEIGHT 350
#define VGA_MEM ((grub_uint8_t *) GRUB_MEMORY_MACHINE_VGA_ADDR)
@ -116,7 +118,8 @@ grub_video_vga_init (void)
static grub_err_t
grub_video_vga_setup (unsigned int width, unsigned int height,
unsigned int mode_type, unsigned int mode_mask)
grub_video_mode_type_t mode_type,
grub_video_mode_type_t mode_mask)
{
grub_err_t err;

2
grub-core/video/ieee1275.c
View file

@ -27,6 +27,8 @@
#include <grub/video_fb.h>
#include <grub/ieee1275/ieee1275.h>
GRUB_MOD_LICENSE ("GPLv3+");
/* Only 8-bit indexed color is supported for now. */
static unsigned old_width, old_height;

2
grub-core/video/readers/jpeg.c
View file

@ -24,6 +24,8 @@
#include <grub/misc.h>
#include <grub/bufio.h>
GRUB_MOD_LICENSE ("GPLv3+");
/* Uncomment following define to enable JPEG debug. */
//#define JPEG_DEBUG

2
grub-core/video/readers/png.c
View file

@ -24,6 +24,8 @@
#include <grub/misc.h>
#include <grub/bufio.h>
GRUB_MOD_LICENSE ("GPLv3+");
/* Uncomment following define to enable PNG debug. */
//#define PNG_DEBUG

2
grub-core/video/readers/tga.c
View file

@ -24,6 +24,8 @@
#include <grub/misc.h>
#include <grub/bufio.h>
GRUB_MOD_LICENSE ("GPLv3+");
/* Uncomment following define to enable TGA debug. */
//#define TGA_DEBUG

158
grub-core/video/sis315_init.c Normal file
View file

@ -0,0 +1,158 @@
static const struct { grub_uint8_t reg; grub_uint8_t val; } sr_dump [] =
{
{ 0x28, 0x81 },
{ 0x2a, 0x00 },
{ 0x29, 0xe1 },
{ 0x2b, 0x81 },
{ 0x2d, 0x00 },
{ 0x2c, 0xe1 },
{ 0x2e, 0x81 },
{ 0x30, 0x00 },
{ 0x2f, 0xe1 },
{ 0x28, 0x01 },
{ 0x29, 0x22 },
{ 0x28, 0x3b },
{ 0x29, 0x22 },
{ 0x2a, 0x01 },
{ 0x2e, 0x01 },
{ 0x2f, 0x22 },
{ 0x2e, 0x3b },
{ 0x2f, 0x22 },
{ 0x30, 0x01 },
{ 0x15, 0x00 },
{ 0x1b, 0x30 },
{ 0x16, 0x0f },
{ 0x16, 0x8f },
{ 0x17, 0xba },
{ 0x16, 0x0f },
{ 0x16, 0x8f },
{ 0x1f, 0x00 },
{ 0x20, 0x20 },
{ 0x23, 0xf6 },
{ 0x24, 0x0d },
{ 0x25, 0x33 },
{ 0x21, 0x84 },
{ 0x22, 0x00 },
{ 0x27, 0x1f },
{ 0x31, 0x00 },
{ 0x33, 0x00 },
{ 0x32, 0x11 },
{ 0x25, 0x33 },
{ 0x05, 0x86 },
{ 0x01, 0x20 },
{ 0x32, 0x11 },
{ 0x1e, 0x00 },
{ 0x1d, 0x00 },
{ 0x00, 0x03 },
{ 0x01, 0x21 },
{ 0x02, 0x0f },
{ 0x03, 0x00 },
{ 0x04, 0x0e },
{ 0x0a, 0x00 },
{ 0x0b, 0x00 },
{ 0x0c, 0x00 },
{ 0x0d, 0x00 },
{ 0x0e, 0x00 },
{ 0x37, 0x00 },
{ 0x0a, 0x00 },
{ 0x0b, 0x00 },
{ 0x0c, 0x05 },
{ 0x0e, 0x00 },
{ 0x0e, 0x00 },
{ 0x10, 0x0b },
{ 0x31, 0x00 },
{ 0x2b, 0x01 },
{ 0x2c, 0xe1 },
{ 0x2b, 0x1b },
{ 0x2c, 0xe1 },
{ 0x2d, 0x01 },
{ 0x3d, 0x00 },
{ 0x08, 0x84 },
{ 0x09, 0x00 },
{ 0x3d, 0x01 },
{ 0x1f, 0x00 },
{ 0x06, 0x02 },
{ 0x0f, 0x00 },
{ 0x17, 0xba },
{ 0x21, 0xa4 },
{ 0x32, 0x11 },
{ 0x07, 0x18 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x01, 0x01 },
{ 0x21, 0x84 },
{ 0x01, 0x21 },
{ 0x16, 0x8f },
{ 0x18, 0xa9 },
{ 0x19, 0xa0 },
{ 0x1b, 0x30 },
{ 0x17, 0xb8 },
{ 0x19, 0xa3 },
{ 0x13, 0x00 },
{ 0x14, 0x00 },
{ 0x14, 0x02 },
{ 0x15, 0x00 },
{ 0x16, 0x0f },
{ 0x16, 0x8f },
{ 0x1d, 0x00 },
{ 0x14, 0x00 },
{ 0x14, 0x01 },
{ 0x15, 0x00 },
{ 0x16, 0x0f },
{ 0x16, 0x8f },
{ 0x1d, 0x00 },
{ 0x14, 0x01 },
{ 0x14, 0x01 },
{ 0x15, 0x10 },
{ 0x13, 0x35 },
{ 0x14, 0x51 },
{ 0x16, 0x0f },
{ 0x16, 0x8f },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x11 },
{ 0x1d, 0x11 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x1d, 0x00 },
{ 0x17, 0xba },
{ 0x19, 0xa0 },
{ 0x19, 0xa0 },
{ 0x01, 0x01 },
{ 0x16, 0x0f },
{ 0x18, 0xa9 },
{ 0x19, 0xa0 },
{ 0x1b, 0x30 },
{ 0x21, 0xa4 },
{ 0x05, 0x86 },
};
static const grub_uint8_t gr[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0f,
0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};

448
grub-core/video/sis315pro.c Normal file
View file

@ -0,0 +1,448 @@
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
*
* GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* GRUB is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#define grub_video_render_target grub_video_fbrender_target
#include <grub/err.h>
#include <grub/types.h>
#include <grub/dl.h>
#include <grub/misc.h>
#include <grub/mm.h>
#include <grub/video.h>
#include <grub/video_fb.h>
#include <grub/pci.h>
#include <grub/vga.h>
#define GRUB_SIS315PRO_PCIID 0x03251039
#define GRUB_SIS315PRO_TOTAL_MEMORY_SPACE 0x800000
#define GRUB_SIS315PRO_MMIO_SPACE 0x1000
static struct
{
struct grub_video_mode_info mode_info;
struct grub_video_render_target *render_target;
grub_uint8_t *ptr;
int mapped;
grub_uint32_t base;
grub_uint32_t mmiobase;
volatile grub_uint32_t *mmioptr;
grub_pci_device_t dev;
grub_port_t io;
} framebuffer;
static grub_uint8_t
read_sis_cmd (grub_uint8_t addr)
{
grub_outb (addr, framebuffer.io + 0x44);
return grub_inb (framebuffer.io + 0x45);
}
static void
write_sis_cmd (grub_uint8_t val, grub_uint8_t addr)
{
grub_outb (addr, framebuffer.io + 0x44);
grub_outb (val, framebuffer.io + 0x45);
}
#ifndef TEST
static grub_err_t
grub_video_sis315pro_video_init (void)
{
/* Reset frame buffer. */
grub_memset (&framebuffer, 0, sizeof(framebuffer));
return grub_video_fb_init ();
}
static grub_err_t
grub_video_sis315pro_video_fini (void)
{
if (framebuffer.mapped)
grub_pci_device_unmap_range (framebuffer.dev, framebuffer.ptr,
GRUB_SIS315PRO_TOTAL_MEMORY_SPACE);
return grub_video_fb_fini ();
}
#endif
#include "sis315_init.c"
static grub_err_t
grub_video_sis315pro_setup (unsigned int width, unsigned int height,
unsigned int mode_type,
unsigned int mode_mask __attribute__ ((unused)))
{
int depth;
grub_err_t err;
int found = 0;
unsigned i;
#ifndef TEST
auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)));
int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)))
{
grub_pci_address_t addr;
grub_uint32_t class;
addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
class = grub_pci_read (addr);
if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA
|| pciid != GRUB_SIS315PRO_PCIID)
return 0;
found = 1;
addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
framebuffer.base = grub_pci_read (addr) & GRUB_PCI_ADDR_MEM_MASK;
addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG1);
framebuffer.mmiobase = grub_pci_read (addr) & GRUB_PCI_ADDR_MEM_MASK;
addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG2);
framebuffer.io = (grub_pci_read (addr) & GRUB_PCI_ADDR_IO_MASK)
+ GRUB_MACHINE_PCI_IO_BASE;
framebuffer.dev = dev;
return 1;
}
/* Decode depth from mode_type. If it is zero, then autodetect. */
depth = (mode_type & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK)
>> GRUB_VIDEO_MODE_TYPE_DEPTH_POS;
if ((width != 640 && width != 0) || (height != 480 && height != 0)
|| (depth != 8 && depth != 0))
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
"Only 640x400x8 is supported");
grub_pci_iterate (find_card);
if (!found)
return grub_error (GRUB_ERR_IO, "Couldn't find graphics card");
#endif
/* Fill mode info details. */
framebuffer.mode_info.width = 640;
framebuffer.mode_info.height = 480;
framebuffer.mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
framebuffer.mode_info.bpp = 8;
framebuffer.mode_info.bytes_per_pixel = 1;
framebuffer.mode_info.pitch = 640 * 1;
framebuffer.mode_info.number_of_colors = 256;
framebuffer.mode_info.red_mask_size = 0;
framebuffer.mode_info.red_field_pos = 0;
framebuffer.mode_info.green_mask_size = 0;
framebuffer.mode_info.green_field_pos = 0;
framebuffer.mode_info.blue_mask_size = 0;
framebuffer.mode_info.blue_field_pos = 0;
framebuffer.mode_info.reserved_mask_size = 0;
framebuffer.mode_info.reserved_field_pos = 0;
#ifndef TEST
framebuffer.mode_info.blit_format
= grub_video_get_blit_format (&framebuffer.mode_info);
#endif
#ifndef TEST
if (found && (framebuffer.base == 0 || framebuffer.mmiobase == 0))
{
grub_pci_address_t addr;
/* FIXME: choose address dynamically if needed. */
framebuffer.base = 0x40000000;
framebuffer.mmiobase = 0x04000000;
framebuffer.io = 0xb300;
addr = grub_pci_make_address (framebuffer.dev, GRUB_PCI_REG_ADDRESS_REG0);
grub_pci_write (addr, framebuffer.base | GRUB_PCI_ADDR_MEM_PREFETCH);
addr = grub_pci_make_address (framebuffer.dev, GRUB_PCI_REG_ADDRESS_REG1);
grub_pci_write (addr, framebuffer.mmiobase);
addr = grub_pci_make_address (framebuffer.dev, GRUB_PCI_REG_ADDRESS_REG2);
grub_pci_write (addr, framebuffer.io | GRUB_PCI_ADDR_SPACE_IO);
/* Set latency. */
addr = grub_pci_make_address (framebuffer.dev, GRUB_PCI_REG_CACHELINE);
grub_pci_write (addr, 0x80004700);
/* Enable address spaces. */
addr = grub_pci_make_address (framebuffer.dev, GRUB_PCI_REG_COMMAND);
grub_pci_write (addr, 0x7);
addr = grub_pci_make_address (framebuffer.dev, 0x30);
grub_pci_write (addr, 0x04060001);
framebuffer.io += GRUB_MACHINE_PCI_IO_BASE;
}
#endif
/* We can safely discard volatile attribute. */
#ifndef TEST
framebuffer.ptr
= (void *) grub_pci_device_map_range (framebuffer.dev,
framebuffer.base,
GRUB_SIS315PRO_TOTAL_MEMORY_SPACE);
framebuffer.mmioptr = grub_pci_device_map_range (framebuffer.dev,
framebuffer.mmiobase,
GRUB_SIS315PRO_MMIO_SPACE);
#endif
framebuffer.mapped = 1;
#ifndef TEST
/* Prevent garbage from appearing on the screen. */
grub_memset (framebuffer.ptr, 0,
framebuffer.mode_info.height * framebuffer.mode_info.pitch);
#endif
grub_outb (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY
| GRUB_VGA_IO_MISC_NEGATIVE_HORIZ_POLARITY
| GRUB_VGA_IO_MISC_UPPER_64K
| GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0
| GRUB_VGA_IO_MISC_28MHZ
| GRUB_VGA_IO_MISC_ENABLE_VRAM_ACCESS
| GRUB_VGA_IO_MISC_COLOR,
GRUB_VGA_IO_MISC_WRITE + GRUB_MACHINE_PCI_IO_BASE);
grub_vga_sr_write (0x86, 5);
for (i = 6; i <= 0x27; i++)
grub_vga_sr_write (0, i);
for (i = 0x31; i <= 0x3d; i++)
grub_vga_sr_write (0, i);
for (i = 0; i < ARRAY_SIZE (sr_dump); i++)
grub_vga_sr_write (sr_dump[i].val, sr_dump[i].reg);
for (i = 0x30; i < 0x40; i++)
grub_vga_cr_write (0, i);
grub_vga_cr_write (0x77, 0x40);
grub_vga_cr_write (0x77, 0x41);
grub_vga_cr_write (0x00, 0x42);
grub_vga_cr_write (0x5b, 0x43);
grub_vga_cr_write (0x00, 0x44);
grub_vga_cr_write (0x23, 0x48);
grub_vga_cr_write (0xaa, 0x49);
grub_vga_cr_write (0x02, 0x37);
grub_vga_cr_write (0x20, 0x5b);
grub_vga_cr_write (0x00, 0x83);
grub_vga_cr_write (0x80, 0x63);
grub_vga_cr_write (0x0c, GRUB_VGA_CR_VSYNC_END);
grub_vga_cr_write (0x5f, GRUB_VGA_CR_HTOTAL);
grub_vga_cr_write (0x4f, GRUB_VGA_CR_HORIZ_END);
grub_vga_cr_write (0x50, GRUB_VGA_CR_HBLANK_START);
grub_vga_cr_write (0x82, GRUB_VGA_CR_HBLANK_END);
grub_vga_cr_write (0x54, GRUB_VGA_CR_HORIZ_SYNC_PULSE_START);
grub_vga_cr_write (0x80, GRUB_VGA_CR_HORIZ_SYNC_PULSE_END);
grub_vga_cr_write (0x0b, GRUB_VGA_CR_VERT_TOTAL);
grub_vga_cr_write (0x3e, GRUB_VGA_CR_OVERFLOW);
grub_vga_cr_write (0x00, GRUB_VGA_CR_BYTE_PANNING);
grub_vga_cr_write (0x40, GRUB_VGA_CR_CELL_HEIGHT);
grub_vga_cr_write (0x00, GRUB_VGA_CR_CURSOR_START);
grub_vga_cr_write (0x00, GRUB_VGA_CR_CURSOR_END);
grub_vga_cr_write (0x00, GRUB_VGA_CR_START_ADDR_HIGH_REGISTER);
grub_vga_cr_write (0x00, GRUB_VGA_CR_START_ADDR_LOW_REGISTER);
grub_vga_cr_write (0x00, GRUB_VGA_CR_CURSOR_ADDR_HIGH);
grub_vga_cr_write (0x00, GRUB_VGA_CR_CURSOR_ADDR_LOW);
grub_vga_cr_write (0xea, GRUB_VGA_CR_VSYNC_START);
grub_vga_cr_write (0x8c, GRUB_VGA_CR_VSYNC_END);
grub_vga_cr_write (0xdf, GRUB_VGA_CR_VDISPLAY_END);
grub_vga_cr_write (0x28, GRUB_VGA_CR_PITCH);
grub_vga_cr_write (0x40, GRUB_VGA_CR_UNDERLINE_LOCATION);
grub_vga_cr_write (0xe7, GRUB_VGA_CR_VERTICAL_BLANK_START);
grub_vga_cr_write (0x04, GRUB_VGA_CR_VERTICAL_BLANK_END);
grub_vga_cr_write (0xa3, GRUB_VGA_CR_MODE);
grub_vga_cr_write (0xff, GRUB_VGA_CR_LINE_COMPARE);
grub_vga_cr_write (0x0c, GRUB_VGA_CR_VSYNC_END);
grub_vga_cr_write (0x5f, GRUB_VGA_CR_HTOTAL);
grub_vga_cr_write (0x4f, GRUB_VGA_CR_HORIZ_END);
grub_vga_cr_write (0x50, GRUB_VGA_CR_HBLANK_START);
grub_vga_cr_write (0x82, GRUB_VGA_CR_HBLANK_END);
grub_vga_cr_write (0x55, GRUB_VGA_CR_HORIZ_SYNC_PULSE_START);
grub_vga_cr_write (0x81, GRUB_VGA_CR_HORIZ_SYNC_PULSE_END);
grub_vga_cr_write (0x0b, GRUB_VGA_CR_VERT_TOTAL);
grub_vga_cr_write (0x3e, GRUB_VGA_CR_OVERFLOW);
grub_vga_cr_write (0xe9, GRUB_VGA_CR_VSYNC_START);
grub_vga_cr_write (0x8b, GRUB_VGA_CR_VSYNC_END);
grub_vga_cr_write (0xdf, GRUB_VGA_CR_VDISPLAY_END);
grub_vga_cr_write (0xe7, GRUB_VGA_CR_VERTICAL_BLANK_START);
grub_vga_cr_write (0x04, GRUB_VGA_CR_VERTICAL_BLANK_END);
grub_vga_cr_write (0x40, GRUB_VGA_CR_CELL_HEIGHT);
grub_vga_cr_write (0x50, GRUB_VGA_CR_PITCH);
grub_vga_cr_write (0x00, 0x19);
grub_vga_cr_write (0x00, 0x1a);
grub_vga_cr_write (0x6c, 0x52);
grub_vga_cr_write (0x2e, 0x34);
grub_vga_cr_write (0x00, 0x31);
grub_vga_cr_write (0, GRUB_VGA_CR_START_ADDR_HIGH_REGISTER);
grub_vga_cr_write (0, GRUB_VGA_CR_START_ADDR_LOW_REGISTER);
for (i = 0; i < 16; i++)
grub_vga_write_arx (i, i);
grub_vga_write_arx (1, GRUB_VGA_ARX_MODE);
grub_vga_write_arx (0, GRUB_VGA_ARX_OVERSCAN);
grub_vga_write_arx (0, GRUB_VGA_ARX_COLOR_PLANE_ENABLE);
grub_vga_write_arx (0, GRUB_VGA_ARX_HORIZONTAL_PANNING);
grub_vga_write_arx (0, GRUB_VGA_ARX_COLOR_SELECT);
grub_outb (0xff, GRUB_VGA_IO_PIXEL_MASK + GRUB_MACHINE_PCI_IO_BASE);
for (i = 0; i < ARRAY_SIZE (gr); i++)
grub_vga_gr_write (gr[i], i);
for (i = 0; i < GRUB_VIDEO_FBSTD_NUMCOLORS; i++)
grub_vga_palette_write (i, grub_video_fbstd_colors[i].r,
grub_video_fbstd_colors[i].g,
grub_video_fbstd_colors[i].b);
#if 1
{
if (read_sis_cmd (0x5) != 0xa1)
write_sis_cmd (0x86, 0x5);
write_sis_cmd (read_sis_cmd (0x20) | 0xa1, 0x20);
write_sis_cmd (read_sis_cmd (0x1e) | 0xda, 0x1e);
#define IND_SIS_CMDQUEUE_SET 0x26
#define IND_SIS_CMDQUEUE_THRESHOLD 0x27
#define COMMAND_QUEUE_THRESHOLD 0x1F
#define SIS_CMD_QUEUE_RESET 0x01
#define SIS_AGP_CMDQUEUE_ENABLE 0x80 /* 315/330/340 series SR26 */
#define SIS_VRAM_CMDQUEUE_ENABLE 0x40
#define SIS_MMIO_CMD_ENABLE 0x20
#define SIS_CMD_QUEUE_SIZE_512k 0x00
#define SIS_CMD_QUEUE_SIZE_1M 0x04
#define SIS_CMD_QUEUE_SIZE_2M 0x08
#define SIS_CMD_QUEUE_SIZE_4M 0x0C
#define SIS_CMD_QUEUE_RESET 0x01
#define SIS_CMD_AUTO_CORR 0x02
write_sis_cmd (COMMAND_QUEUE_THRESHOLD, IND_SIS_CMDQUEUE_THRESHOLD);
write_sis_cmd (SIS_CMD_QUEUE_RESET, IND_SIS_CMDQUEUE_SET);
framebuffer.mmioptr[0x85C4 / 4] = framebuffer.mmioptr[0x85C8 / 4];
write_sis_cmd (SIS_MMIO_CMD_ENABLE | SIS_CMD_AUTO_CORR, IND_SIS_CMDQUEUE_SET);
framebuffer.mmioptr[0x85C0 / 4] = (0x1000000 - (512 * 1024));
}
#endif
#ifndef TEST
err = grub_video_fb_create_render_target_from_pointer (&framebuffer
.render_target,
&framebuffer.mode_info,
framebuffer.ptr);
if (err)
return err;
err = grub_video_fb_set_active_render_target (framebuffer.render_target);
if (err)
return err;
/* Copy default palette to initialize emulated palette. */
err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
grub_video_fbstd_colors);
#endif
return err;
}
#ifndef TEST
static grub_err_t
grub_video_sis315pro_swap_buffers (void)
{
/* TODO: Implement buffer swapping. */
return GRUB_ERR_NONE;
}
static grub_err_t
grub_video_sis315pro_set_active_render_target (struct grub_video_render_target *target)
{
if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY)
target = framebuffer.render_target;
return grub_video_fb_set_active_render_target (target);
}
static grub_err_t
grub_video_sis315pro_get_info_and_fini (struct grub_video_mode_info *mode_info,
void **framebuf)
{
grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info));
*framebuf = (char *) framebuffer.ptr;
grub_video_fb_fini ();
return GRUB_ERR_NONE;
}
static struct grub_video_adapter grub_video_sis315pro_adapter =
{
.name = "SIS315PRO Video Driver",
.id = GRUB_VIDEO_DRIVER_SIS315PRO,
.prio = GRUB_VIDEO_ADAPTER_PRIO_NATIVE,
.init = grub_video_sis315pro_video_init,
.fini = grub_video_sis315pro_video_fini,
.setup = grub_video_sis315pro_setup,
.get_info = grub_video_fb_get_info,
.get_info_and_fini = grub_video_sis315pro_get_info_and_fini,
.set_palette = grub_video_fb_set_palette,
.get_palette = grub_video_fb_get_palette,
.set_viewport = grub_video_fb_set_viewport,
.get_viewport = grub_video_fb_get_viewport,
.map_color = grub_video_fb_map_color,
.map_rgb = grub_video_fb_map_rgb,
.map_rgba = grub_video_fb_map_rgba,
.unmap_color = grub_video_fb_unmap_color,
.fill_rect = grub_video_fb_fill_rect,
.blit_bitmap = grub_video_fb_blit_bitmap,
.blit_render_target = grub_video_fb_blit_render_target,
.scroll = grub_video_fb_scroll,
.swap_buffers = grub_video_sis315pro_swap_buffers,
.create_render_target = grub_video_fb_create_render_target,
.delete_render_target = grub_video_fb_delete_render_target,
.set_active_render_target = grub_video_sis315pro_set_active_render_target,
.get_active_render_target = grub_video_fb_get_active_render_target,
.next = 0
};
GRUB_MOD_INIT(video_sis315pro)
{
grub_video_register (&grub_video_sis315pro_adapter);
}
GRUB_MOD_FINI(video_sis315pro)
{
grub_video_unregister (&grub_video_sis315pro_adapter);
}
#else
int
main ()
{
grub_video_sis315pro_setup (640, 400, 0, 0);
}
#endif

2
grub-core/video/video.c
View file

@ -22,6 +22,8 @@
#include <grub/misc.h>
#include <grub/mm.h>
GRUB_MOD_LICENSE ("GPLv3+");
/* The list of video adapters registered to system. */
grub_video_adapter_t grub_video_adapter_list = NULL;