diff options
Diffstat (limited to 'grub')
| -rw-r--r-- | grub/.md5sum | 2 | ||||
| -rw-r--r-- | grub/.sha256sum | 2 | ||||
| -rw-r--r-- | grub/Pkgfile | 40 | ||||
| -rw-r--r-- | grub/Pkgfile.old | 28 | ||||
| -rw-r--r-- | grub/grub2-915resolution.patch | 928 |
5 files changed, 1000 insertions, 0 deletions
diff --git a/grub/.md5sum b/grub/.md5sum new file mode 100644 index 0000000..4d6f3ea --- /dev/null +++ b/grub/.md5sum @@ -0,0 +1,2 @@ +66fe18cd9318e3d67a34d7b7a8e7b1f6 grub-1.97.1.tar.gz +fce8d15f5d8d334c9362e423c97355ba grub2-915resolution.patch diff --git a/grub/.sha256sum b/grub/.sha256sum new file mode 100644 index 0000000..4a9ba82 --- /dev/null +++ b/grub/.sha256sum @@ -0,0 +1,2 @@ +51f04517a3eb730a0f66e68cf5b0e376f6a073899b4405b2ac14667825f937bf grub-1.97.1.tar.gz +116a015948c0417901a10a70ffb6ca7c72e865cac2f5a5d5c56258a4ef8b8bf7 grub2-915resolution.patch diff --git a/grub/Pkgfile b/grub/Pkgfile new file mode 100644 index 0000000..f7838f2 --- /dev/null +++ b/grub/Pkgfile @@ -0,0 +1,40 @@ +description="GNU GRUB (GRand Unified Bootloader) 2." +packager="Hannes Mayer <kontakt AT ecarux DOT de>" +maintainer="Lukc <lukc AT upyum DOT com>" +url="http://www.gnu.org/software/grub/" +#XXX: Euh… lzo dans base… pourquoi pas… mais freetype ? +# À corriger, donc, et voir si freetype est vraiment requis pour +# grub-mkfont. +depends=(gettext lzo) +if use grub-mkfont; then + depends=(${depends[@]} freetype) +fi + +name=grub +version=1.97.1 +release=1 +source=( + ftp://alpha.gnu.org/gnu/$name/$name-$version.tar.gz + grub2-915resolution.patch +) + +include autotools # errlogs, etc. +build () { + cd $name-$version; + CFLAGS="${CFLAGS//-O[0-9]/-O1}" + ./autogen.sh; + patch -p1 < $SRC/grub2-915resolution.patch; + sed -i 's|/usr/src/unifont.bdf|/usr/share/fonts/misc/unifont.bdf|' configure; + ./configure \ + --prefix=$prefix \ + --disable-werror \ + --sysconfdir=$sysconfdir \ + --libdir=$sharedir \ + --mandir=$mandir \ + --sbindir=/sbin \ + $(use_enable nls) \ + $(use_enable grub-mkfont); + make; + make DESTDIR=$PKG install +} + diff --git a/grub/Pkgfile.old b/grub/Pkgfile.old new file mode 100644 index 0000000..b2991c6 --- /dev/null +++ b/grub/Pkgfile.old @@ -0,0 +1,28 @@ +# Description: GNU GRUB (GRand Unified Bootloader) 2 +# URL: http://www.gnu.org/software/grub/ +# Maintainer: Hannes Mayer, kontakt at ecarux dot de +# Depends on: gettext, lzo, freetype + +name=grub +version=1.97.1 +release=1 +source=(ftp://alpha.gnu.org/gnu/$name/$name-$version.tar.gz \ + grub2-915resolution.patch) + +build () { + cd $name-$version + ./autogen.sh + patch -p1 < $SRC/grub2-915resolution.patch + sed -i 's|/usr/src/unifont.bdf|/usr/share/fonts/misc/unifont.bdf|' configure + ./configure --prefix=/usr \ + --disable-werror \ + --sysconfdir=/etc \ + --libdir=/usr/share \ + --mandir=/usr/man \ + --sbindir=/sbin \ + --disable-nls \ + --enable-grub-mkfont + + make + make DESTDIR=$PKG install +} diff --git a/grub/grub2-915resolution.patch b/grub/grub2-915resolution.patch new file mode 100644 index 0000000..38f0c28 --- /dev/null +++ b/grub/grub2-915resolution.patch @@ -0,0 +1,928 @@ +diff -Naur grub-1.97.1.orig/915resolution/915resolution.c grub-1.97.1/915resolution/915resolution.c +--- grub-1.97.1.orig/915resolution/915resolution.c 1970-01-01 01:00:00.000000000 +0100 ++++ grub-1.97.1/915resolution/915resolution.c 2009-11-21 21:42:20.317546083 +0100 +@@ -0,0 +1,902 @@ ++/* 915resolution - Utility to change vbemodes on the intel ++ * integrated video chipset */ ++ ++/* Copied from 915 resolution created by steve tomjenovic ++ * 915 resolution was in the public domain. ++ * ++ * All I have done, was make the above program run within ++ * the grub2 environment. ++ * ++ * Some of the checks are still commented, as I did not find ++ * easy replacement for memmem. ++ * ++ * Slightly edited by Nathan Coulson (conathan@gmail.com) ++ */ ++ ++/* ++ * GRUB -- GRand Unified Bootloader ++ * Copyright (C) 2003,2007 Free Software Foundation, Inc. ++ * Copyright (C) 2003 NIIBE Yutaka <gniibe@m17n.org> ++ * ++ * 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/>. ++ */ ++ ++#include <grub/types.h> ++#include <grub/misc.h> ++#include <grub/mm.h> ++#include <grub/err.h> ++#include <grub/dl.h> ++#include <grub/normal.h> ++#include <grub/i386/io.h> ++ ++#define NEW(a) ((a *)(grub_malloc(sizeof(a)))) ++#define FREE(a) (grub_free(a)) ++ ++#define VBIOS_START 0xc0000 ++#define VBIOS_SIZE 0x10000 ++ ++#define FALSE 0 ++#define TRUE 1 ++ ++#define MODE_TABLE_OFFSET_845G 617 ++ ++#define VERSION "0.5.3-grub2-1" ++ ++#define ATI_SIGNATURE1 "ATI MOBILITY RADEON" ++#define ATI_SIGNATURE2 "ATI Technologies Inc" ++#define NVIDIA_SIGNATURE "NVIDIA Corp" ++#define INTEL_SIGNATURE "Intel Corp" ++ ++typedef unsigned char * address; ++typedef unsigned char byte; ++typedef unsigned short word; ++typedef unsigned char boolean; ++typedef unsigned int cardinal; ++ ++typedef enum { ++ CT_UNKWN, CT_830, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM, CT_945GME, ++ CT_946GZ, CT_G965, CT_Q965, CT_965GM ++} chipset_type; ++ ++char * chipset_type_names[] = { ++ "UNKNOWN", "830", "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM", "945GME", ++ "946GZ", "G965", "Q965", "965GM" ++}; ++ ++typedef enum { ++ BT_UNKWN, BT_1, BT_2, BT_3 ++} bios_type; ++ ++char * bios_type_names[] = {"UNKNOWN", "TYPE 1", "TYPE 2", "TYPE 3"}; ++ ++int freqs[] = { 60, 75, 85 }; ++ ++typedef struct { ++ byte mode; ++ byte bits_per_pixel; ++ word resolution; ++ byte unknown; ++} __attribute__((packed)) vbios_mode; ++ ++typedef struct { ++ byte unknow1[2]; ++ byte x1; ++ byte x_total; ++ byte x2; ++ byte y1; ++ byte y_total; ++ byte y2; ++} __attribute__((packed)) vbios_resolution_type1; ++ ++typedef struct { ++ unsigned long clock; ++ ++ word x1; ++ word htotal; ++ word x2; ++ word hblank; ++ word hsyncstart; ++ word hsyncend; ++ word y1; ++ word vtotal; ++ word y2; ++ word vblank; ++ word vsyncstart; ++ word vsyncend; ++} __attribute__((packed)) vbios_modeline_type2; ++ ++typedef struct { ++ byte xchars; ++ byte ychars; ++ byte unknown[4]; ++ ++ vbios_modeline_type2 modelines[]; ++} __attribute__((packed)) vbios_resolution_type2; ++ ++typedef struct { ++ unsigned long clock; ++ ++ word x1; ++ word htotal; ++ word x2; ++ word hblank; ++ word hsyncstart; ++ word hsyncend; ++ ++ word y1; ++ word vtotal; ++ word y2; ++ word vblank; ++ word vsyncstart; ++ word vsyncend; ++ ++ word timing_h; ++ word timing_v; ++ ++ byte unknown[6]; ++} __attribute__((packed)) vbios_modeline_type3; ++ ++typedef struct { ++ unsigned char unknown[6]; ++ ++ vbios_modeline_type3 modelines[]; ++} __attribute__((packed)) vbios_resolution_type3; ++ ++typedef struct { ++ cardinal chipset_id; ++ chipset_type chipset; ++ bios_type bios; ++ ++ int bios_fd; ++ address bios_ptr; ++ ++ vbios_mode * mode_table; ++ cardinal mode_table_size; ++ byte b1, b2; ++ ++ boolean unlocked; ++} vbios_map; ++ ++ ++cardinal get_chipset_id(void) { ++ grub_outl(0x80000000, 0xcf8); ++ return grub_inl(0xcfc); ++} ++ ++chipset_type get_chipset(cardinal id) { ++ chipset_type type; ++ ++ switch (id) { ++ case 0x35758086: ++ type = CT_830; ++ break; ++ ++ case 0x25608086: ++ type = CT_845G; ++ break; ++ ++ case 0x35808086: ++ type = CT_855GM; ++ break; ++ ++ case 0x25708086: ++ type = CT_865G; ++ break; ++ ++ case 0x25808086: ++ type = CT_915G; ++ break; ++ ++ case 0x25908086: ++ type = CT_915GM; ++ break; ++ ++ case 0x27708086: ++ type = CT_945G; ++ break; ++ ++ case 0x27a08086: ++ type = CT_945GM; ++ break; ++ ++ case 0x27ac8086: ++ type = CT_945GME; ++ break; ++ ++ case 0x29708086: ++ type = CT_946GZ; ++ break; ++ ++ case 0x29a08086: ++ type = CT_G965; ++ break; ++ ++ case 0x29908086: ++ type = CT_Q965; ++ break; ++ ++ case 0x2a008086: ++ type = CT_965GM; ++ break; ++ ++ default: ++ type = CT_UNKWN; ++ break; ++ } ++ ++ return type; ++} ++ ++vbios_resolution_type1 * map_type1_resolution(vbios_map * map, word res) { ++ vbios_resolution_type1 * ptr = ((vbios_resolution_type1*)(map->bios_ptr + res)); ++ return ptr; ++} ++ ++vbios_resolution_type2 * map_type2_resolution(vbios_map * map, word res) { ++ vbios_resolution_type2 * ptr = ((vbios_resolution_type2*)(map->bios_ptr + res)); ++ return ptr; ++} ++ ++vbios_resolution_type3 * map_type3_resolution(vbios_map * map, word res) { ++ vbios_resolution_type3 * ptr = ((vbios_resolution_type3*)(map->bios_ptr + res)); ++ return ptr; ++} ++ ++boolean detect_bios_type(vbios_map * map, boolean modeline, int entry_size) { ++ int i; ++ short int r1, r2; ++ ++ r1 = r2 = 32000; ++ ++ for (i=0; i < map->mode_table_size; i++) { ++ if (map->mode_table[i].resolution <= r1) { ++ r1 = map->mode_table[i].resolution; ++ } ++ else { ++ if (map->mode_table[i].resolution <= r2) { ++ r2 = map->mode_table[i].resolution; ++ } ++ } ++ ++ /*printf("r1 = %d r2 = %d\n", r1, r2);*/ ++ } ++ ++ return (r2-r1-6) % entry_size == 0; ++} ++ ++void close_vbios(vbios_map * map); ++ ++vbios_map * open_vbios(chipset_type forced_chipset) { ++ int z; ++ vbios_map * map = NEW(vbios_map); ++ for(z=0; z<sizeof(vbios_map); z++) ((char*)map)[z]=0; ++ /* ++ * Determine chipset ++ */ ++ ++ if (forced_chipset == CT_UNKWN) { ++ map->chipset_id = get_chipset_id(); ++ map->chipset = get_chipset(map->chipset_id); ++ } ++ else if (forced_chipset != CT_UNKWN) { ++ map->chipset = forced_chipset; ++ } ++ else { ++ map->chipset = CT_915GM; ++ } ++ ++ /* ++ * Map the video bios to memory ++ */ ++ ++ map->bios_ptr=(char*)VBIOS_START; ++ ++ /* ++ * check if we have ATI Radeon ++ */ ++ ++ /*if (memmem(map->bios_ptr, VBIOS_SIZE, ATI_SIGNATURE1, strlen(ATI_SIGNATURE1)) || ++ memmem(map->bios_ptr, VBIOS_SIZE, ATI_SIGNATURE2, strlen(ATI_SIGNATURE2)) ) { ++ grub_printf(stderr, "ATI chipset detected. 915resolution only works with Intel 800/900 series graphic chipsets.\n"); ++ return 0; ++ }*/ ++ ++ /* ++ * check if we have NVIDIA ++ */ ++ ++ /*if (memmem(map->bios_ptr, VBIOS_SIZE, NVIDIA_SIGNATURE, strlen(NVIDIA_SIGNATURE))) { ++ grub_printf("NVIDIA chipset detected. 915resolution only works with Intel 800/900 series graphic chipsets.\n"); ++ return 0; ++ }*/ ++ ++ /* ++ * check if we have Intel ++ */ ++ ++ /*if (map->chipset == CT_UNKWN && memmem(map->bios_ptr, VBIOS_SIZE, INTEL_SIGNATURE, strlen(INTEL_SIGNATURE))) { ++ grub_printf( "Intel chipset detected. However, 915resolution was unable to determine the chipset type.\n"); ++ ++ grub_printf("Chipset Id: %x\n", map->chipset_id); ++ ++ grub_printf("Please report this problem to stomljen@yahoo.com\n"); ++ ++ close_vbios(map); ++ return 0; ++ }*/ ++ ++ /* ++ * check for others ++ */ ++ ++ if (map->chipset == CT_UNKWN) { ++ grub_printf("Unknown chipset type and unrecognized bios.\n"); ++ ++ grub_printf("915resolution only works with Intel 800/900 series graphic chipsets.\n"); ++ ++ grub_printf("Chipset Id: %x\n", map->chipset_id); ++ close_vbios(map); ++ return 0; ++ } ++ ++ /* ++ * Figure out where the mode table is ++ */ ++ ++ { ++ address p = map->bios_ptr + 16; ++ address limit = map->bios_ptr + VBIOS_SIZE - (3 * sizeof(vbios_mode)); ++ ++ while (p < limit && map->mode_table == 0) { ++ vbios_mode * mode_ptr = (vbios_mode *) p; ++ ++ if (((mode_ptr[0].mode & 0xf0) == 0x30) && ((mode_ptr[1].mode & 0xf0) == 0x30) && ++ ((mode_ptr[2].mode & 0xf0) == 0x30) && ((mode_ptr[3].mode & 0xf0) == 0x30)) { ++ map->mode_table = mode_ptr; ++ } ++ ++ p++; ++ } ++ ++ if (map->mode_table == 0) { ++ grub_printf("Unable to locate the mode table.\n"); ++ grub_printf("Please run the program 'dump_bios' as root and\n"); ++ grub_printf("email the file 'vbios.dmp' to stomljen@yahoo.com.\n"); ++ grub_printf("Chipset: %s\n", chipset_type_names[map->chipset]); ++ close_vbios(map); ++ return 0; ++ } ++ } ++ ++ /* ++ * Determine size of mode table ++ */ ++ ++ { ++ vbios_mode * mode_ptr = map->mode_table; ++ ++ while (mode_ptr->mode != 0xff) { ++ map->mode_table_size++; ++ mode_ptr++; ++ } ++ } ++ ++ /* ++ * Figure out what type of bios we have ++ * order of detection is important ++ */ ++ ++ if (detect_bios_type(map, TRUE, sizeof(vbios_modeline_type3))) { ++ map->bios = BT_3; ++ } ++ else if (detect_bios_type(map, TRUE, sizeof(vbios_modeline_type2))) { ++ map->bios = BT_2; ++ } ++ else if (detect_bios_type(map, FALSE, sizeof(vbios_resolution_type1))) { ++ map->bios = BT_1; ++ } ++ else { ++ grub_printf("Unable to determine bios type.\n"); ++ grub_printf("Please run the program 'dump_bios' as root and\n"); ++ grub_printf("email the file 'vbios.dmp' to stomljen@yahoo.com.\n"); ++ ++ grub_printf("Chipset: %s\n", chipset_type_names[map->chipset]); ++ grub_printf("Mode Table Offset: $C0000 + $%x\n", ((cardinal)map->mode_table) - ((cardinal)map->bios_ptr)); ++ ++ grub_printf("Mode Table Entries: %u\n", map->mode_table_size); ++ return 0; ++ } ++ ++ return map; ++} ++ ++void close_vbios(vbios_map * map) { ++ FREE(map); ++} ++ ++void unlock_vbios(vbios_map * map) { ++ ++ map->unlocked = TRUE; ++ ++ switch (map->chipset) { ++ case CT_UNKWN: ++ break; ++ case CT_830: ++ case CT_855GM: ++ grub_outl(0x8000005a, 0xcf8); ++ map->b1 = grub_inb(0xcfe); ++ ++ grub_outl(0x8000005a, 0xcf8); ++ grub_outb(0x33, 0xcfe); ++ break; ++ case CT_845G: ++ case CT_865G: ++ case CT_915G: ++ case CT_915GM: ++ case CT_945G: ++ case CT_945GM: ++ case CT_945GME: ++ case CT_946GZ: ++ case CT_G965: ++ case CT_Q965: ++ case CT_965GM: ++ grub_outl(0x80000090, 0xcf8); ++ map->b1 = grub_inb(0xcfd); ++ map->b2 = grub_inb(0xcfe); ++ grub_outl(0x80000090, 0xcf8); ++ grub_outb(0x33, 0xcfd); ++ grub_outb(0x33, 0xcfe); ++ break; ++ } ++ ++#if DEBUG ++ { ++ cardinal t = grub_inl(0xcfc); ++ grub_printf("unlock PAM: (0x%08x)\n", t); ++ } ++#endif ++} ++ ++void relock_vbios(vbios_map * map) { ++ ++ map->unlocked = FALSE; ++ ++ switch (map->chipset) { ++ case CT_UNKWN: ++ break; ++ case CT_830: ++ case CT_855GM: ++ grub_outl(0x8000005a, 0xcf8); ++ grub_outb(map->b1, 0xcfe); ++ break; ++ case CT_845G: ++ case CT_865G: ++ case CT_915G: ++ case CT_915GM: ++ case CT_945G: ++ case CT_945GM: ++ case CT_945GME: ++ case CT_946GZ: ++ case CT_G965: ++ case CT_Q965: ++ case CT_965GM: ++ grub_outl(0x80000090, 0xcf8); ++ grub_outb(map->b1, 0xcfd); ++ grub_outb(map->b2, 0xcfe); ++ break; ++ } ++ ++#if DEBUG ++ { ++ cardinal t = inl(0xcfc); ++ grub_printf("relock PAM: (0x%08x)\n", t); ++ } ++#endif ++} ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++void list_modes(vbios_map *map, cardinal raw) { ++ cardinal i, x, y; ++ ++ for (i=0; i < map->mode_table_size; i++) { ++ switch(map->bios) { ++ case BT_1: ++ { ++ vbios_resolution_type1 * res = map_type1_resolution(map, map->mode_table[i].resolution); ++ ++ x = ((((cardinal) res->x2) & 0xf0) << 4) | res->x1; ++ y = ((((cardinal) res->y2) & 0xf0) << 4) | res->y1; ++ ++ if (x != 0 && y != 0) { ++ grub_printf("Mode %02x : %dx%d, %d bits/pixel\n", map->mode_table[i].mode, x, y, map->mode_table[i].bits_per_pixel); ++ } ++ ++ if (raw) ++ { ++ grub_printf("Mode %02x (raw) :\n\t%02x %02x\n\t%02x\n\t%02x\n\t%02x\n\t%02x\n\t%02x\n\t%02x\n", map->mode_table[i].mode, res->unknow1[0],res->unknow1[1], res->x1,res->x_total,res->x2,res->y1,res->y_total,res->y2); ++ } ++ ++ } ++ break; ++ case BT_2: ++ { ++ vbios_resolution_type2 * res = map_type2_resolution(map, map->mode_table[i].resolution); ++ ++ x = res->modelines[0].x1+1; ++ y = res->modelines[0].y1+1; ++ ++ if (x != 0 && y != 0) { ++ grub_printf("Mode %02x : %dx%d, %d bits/pixel\n", map->mode_table[i].mode, x, y, map->mode_table[i].bits_per_pixel); ++ } ++ } ++ break; ++ case BT_3: ++ { ++ vbios_resolution_type3 * res = map_type3_resolution(map, map->mode_table[i].resolution); ++ ++ x = res->modelines[0].x1+1; ++ y = res->modelines[0].y1+1; ++ ++ if (x != 0 && y != 0) { ++ grub_printf("Mode %02x : %dx%d, %d bits/pixel\n", map->mode_table[i].mode, x, y, map->mode_table[i].bits_per_pixel); ++ } ++ } ++ break; ++ case BT_UNKWN: ++ break; ++ } ++ } ++} ++ ++ ++ ++ ++ ++static void gtf_timings(int x, int y, int freq, ++ unsigned long *clock, ++ word *hsyncstart, word *hsyncend, word *hblank, ++ word *vsyncstart, word *vsyncend, word *vblank) ++{ ++ int hbl, vbl, vfreq; ++ ++ vbl = y + (y+1)/(20000.0/(11*freq) - 1) + 1.5; ++ vfreq = vbl * freq; ++ hbl = 16 * (int)(x * (30.0 - 300000.0 / vfreq) / ++ (70.0 + 300000.0 / vfreq) / 16.0 + 0.5); ++ ++ *vsyncstart = y; ++ *vsyncend = y + 3; ++ *vblank = vbl - 1; ++ *hsyncstart = x + hbl / 2 - (x + hbl + 50) / 100 * 8 - 1; ++ *hsyncend = x + hbl / 2 - 1; ++ *hblank = x + hbl - 1; ++ *clock = (x + hbl) * vfreq / 1000; ++} ++ ++void set_mode(vbios_map * map, cardinal mode, cardinal x, cardinal y, cardinal bp, cardinal htotal, cardinal vtotal) { ++ int xprev, yprev; ++ cardinal i, j; ++ ++ for (i=0; i < map->mode_table_size; i++) { ++ if (map->mode_table[i].mode == mode) { ++ switch(map->bios) { ++ case BT_1: ++ { ++ vbios_resolution_type1 * res = map_type1_resolution(map, map->mode_table[i].resolution); ++ ++ if (bp) { ++ map->mode_table[i].bits_per_pixel = bp; ++ } ++ ++ res->x2 = (htotal?(((htotal-x) >> 8) & 0x0f) : (res->x2 & 0x0f)) | ((x >> 4) & 0xf0); ++ res->x1 = (x & 0xff); ++ ++ res->y2 = (vtotal?(((vtotal-y) >> 8) & 0x0f) : (res->y2 & 0x0f)) | ((y >> 4) & 0xf0); ++ res->y1 = (y & 0xff); ++ if (htotal) ++ res->x_total = ((htotal-x) & 0xff); ++ ++ if (vtotal) ++ res->y_total = ((vtotal-y) & 0xff); ++ } ++ break; ++ case BT_2: ++ { ++ vbios_resolution_type2 * res = map_type2_resolution(map, map->mode_table[i].resolution); ++ ++ res->xchars = x / 8; ++ res->ychars = y / 16 - 1; ++ xprev = res->modelines[0].x1; ++ yprev = res->modelines[0].y1; ++ ++ for(j=0; j < 3; j++) { ++ vbios_modeline_type2 * modeline = &res->modelines[j]; ++ ++ if (modeline->x1 == xprev && modeline->y1 == yprev) { ++ modeline->x1 = modeline->x2 = x-1; ++ modeline->y1 = modeline->y2 = y-1; ++ ++ gtf_timings(x, y, freqs[j], &modeline->clock, ++ &modeline->hsyncstart, &modeline->hsyncend, ++ &modeline->hblank, &modeline->vsyncstart, ++ &modeline->vsyncend, &modeline->vblank); ++ ++ if (htotal) ++ modeline->htotal = htotal; ++ else ++ modeline->htotal = modeline->hblank; ++ ++ if (vtotal) ++ modeline->vtotal = vtotal; ++ else ++ modeline->vtotal = modeline->vblank; ++ } ++ } ++ } ++ break; ++ case BT_3: ++ { ++ vbios_resolution_type3 * res = map_type3_resolution(map, map->mode_table[i].resolution); ++ ++ xprev = res->modelines[0].x1; ++ yprev = res->modelines[0].y1; ++ ++ for (j=0; j < 3; j++) { ++ vbios_modeline_type3 * modeline = &res->modelines[j]; ++ ++ if (modeline->x1 == xprev && modeline->y1 == yprev) { ++ modeline->x1 = modeline->x2 = x-1; ++ modeline->y1 = modeline->y2 = y-1; ++ ++ gtf_timings(x, y, freqs[j], &modeline->clock, ++ &modeline->hsyncstart, &modeline->hsyncend, ++ &modeline->hblank, &modeline->vsyncstart, ++ &modeline->vsyncend, &modeline->vblank); ++ if (htotal) ++ modeline->htotal = htotal; ++ else ++ modeline->htotal = modeline->hblank; ++ if (vtotal) ++ modeline->vtotal = vtotal; ++ else ++ modeline->vtotal = modeline->vblank; ++ ++ modeline->timing_h = y-1; ++ modeline->timing_v = x-1; ++ } ++ } ++ } ++ break; ++ case BT_UNKWN: ++ break; ++ } ++ } ++ } ++} ++ ++void display_map_info(vbios_map * map) { ++ grub_printf("Chipset: %s\n", chipset_type_names[map->chipset]); ++ grub_printf("BIOS: %s\n", bios_type_names[map->bios]); ++ ++ grub_printf("Mode Table Offset: $C0000 + $%x\n", ((cardinal)map->mode_table) - ((cardinal)map->bios_ptr)); ++ grub_printf("Mode Table Entries: %u\n", map->mode_table_size); ++} ++ ++ ++int parse_args(int argc, char *argv[], chipset_type *forced_chipset, cardinal *list, cardinal *mode, cardinal *x, cardinal *y, cardinal *bp, cardinal *raw, cardinal *htotal, cardinal *vtotal) { ++ cardinal index = 0; ++ ++ *list = *mode = *x = *y = *raw = *htotal = *vtotal = 0; ++ ++ *forced_chipset = CT_UNKWN; ++ ++ ++ if ((argc > index) && !grub_strcmp(argv[index], "-c")) { ++ index++; ++ ++ if(argc<=index) { ++ return 0; ++ } ++ ++ if (!grub_strcmp(argv[index], "845")) { ++ *forced_chipset = CT_845G; ++ } ++ else if (!grub_strcmp(argv[index], "855")) { ++ *forced_chipset = CT_855GM; ++ } ++ else if (!grub_strcmp(argv[index], "865")) { ++ *forced_chipset = CT_865G; ++ } ++ else if (!grub_strcmp(argv[index], "915G")) { ++ *forced_chipset = CT_915G; ++ } ++ else if (!grub_strcmp(argv[index], "915GM")) { ++ *forced_chipset = CT_915GM; ++ } ++ else if (!grub_strcmp(argv[index], "945G")) { ++ *forced_chipset = CT_945G; ++ } ++ else if (!grub_strcmp(argv[index], "945GM")) { ++ *forced_chipset = CT_945GM; ++ } ++ else if (!grub_strcmp(argv[index], "945GME")) { ++ *forced_chipset = CT_945GME; ++ } ++ else if (!grub_strcmp(argv[index], "946GZ")) { ++ *forced_chipset = CT_946GZ; ++ } ++ else if (!grub_strcmp(argv[index], "G965")) { ++ *forced_chipset = CT_G965; ++ } ++ else if (!grub_strcmp(argv[index], "Q965")) { ++ *forced_chipset = CT_Q965; ++ } ++ else if (!grub_strcmp(argv[index], "965GM")) { ++ *forced_chipset = CT_965GM; ++ } ++ else { ++ *forced_chipset = CT_UNKWN; ++ } ++ ++ index++; ++ ++ if (argc<=index) { ++ return 0; ++ } ++ } ++ ++ if ((argc > index) && !grub_strcmp(argv[index], "-l")) { ++ *list = 1; ++ index++; ++ ++ if(argc<=index) { ++ return 0; ++ } ++ } ++ ++ if ((argc > index) && !grub_strcmp(argv[index], "-r")) { ++ *raw = 1; ++ index++; ++ ++ if(argc<=index) { ++ return 0; ++ } ++ } ++ ++ if (argc-index < 3 || argc-index > 6) { ++ return -1; ++ } ++ ++ *mode = (cardinal) grub_strtoul(argv[index], NULL, 16); ++ *x = (cardinal)grub_strtoul(argv[index+1], NULL, 10); ++ *y = (cardinal)grub_strtoul(argv[index+2], NULL, 10); ++ ++ ++ if (argc-index > 3) { ++ *bp = (cardinal)grub_strtoul(argv[index+3], NULL, 10); ++ } ++ else { ++ *bp = 0; ++ } ++ ++ if (argc-index > 4) { ++ *htotal = (cardinal)grub_strtoul(argv[index+4], NULL, 10); ++ } ++ else { ++ *htotal = 0; ++ } ++ ++ if (argc-index > 5) { ++ *vtotal = (cardinal)grub_strtoul(argv[index+5], NULL, 10); ++ } ++ else { ++ *vtotal = 0; ++ } ++ ++ return 0; ++} ++ ++void usage() { ++ grub_printf("Usage: 915resolution [-c chipset] [-l] [mode X Y] [bits/pixel] [htotal] [vtotal]\n"); ++ grub_printf(" Set the resolution to XxY for a video mode\n"); ++ grub_printf(" Bits per pixel are optional. htotal/vtotal settings are additionally optional.\n"); ++ grub_printf(" Options:\n"); ++ grub_printf(" -c force chipset type (THIS IS USED FOR DEBUG PURPOSES)\n"); ++ grub_printf(" -l display the modes found in the video BIOS\n"); ++ grub_printf(" -r display the modes found in the video BIOS in raw mode (THIS IS USED FOR DEBUG PURPOSES)\n"); ++} ++ ++static grub_err_t ++grub_cmd_915resolution (struct grub_arg_list *state , ++ int argc , ++ char **argv ) ++{ ++ vbios_map * map; ++ cardinal list, mode, x, y, bp, raw, htotal, vtotal; ++ chipset_type forced_chipset; ++ ++ grub_printf("Intel 800/900 Series VBIOS Hack : version %s\n\n", VERSION); ++ ++ if (parse_args(argc, argv, &forced_chipset, &list, &mode, &x, &y, &bp, &raw, &htotal, &vtotal) == -1) { ++ usage(); ++ return 2; ++ } ++ ++ map = open_vbios(forced_chipset); ++ display_map_info(map); ++ ++ grub_printf("\n"); ++ ++ if (list) { ++ list_modes(map, raw); ++ } ++ ++ if (mode!=0 && x!=0 && y!=0) { ++ unlock_vbios(map); ++ ++ set_mode(map, mode, x, y, bp, htotal, vtotal); ++ ++ relock_vbios(map); ++ ++ grub_printf("Patch mode %02x to resolution %dx%d complete\n", mode, x, y); ++ ++ if (list) { ++ list_modes(map, raw); ++ } ++ } ++ ++ close_vbios(map); ++ ++ return 0; ++} ++ ++ ++ ++ ++ ++ ++static grub_command_t cmd; ++GRUB_MOD_INIT(915resolution) ++{ ++ (void)mod; /* To stop warning. */ ++ cmd=grub_register_command ("915resolution", grub_cmd_915resolution, ++ "915resolution", "Intel VBE editor"); ++} ++ ++GRUB_MOD_FINI(915resolution) ++{ ++ grub_unregister_command (cmd); ++} ++ ++ +diff -Naur grub-1.97.1.orig/conf/common.rmk grub-1.97.1/conf/common.rmk +--- grub-1.97.1.orig/conf/common.rmk 2009-11-09 16:48:15.000000000 +0100 ++++ grub-1.97.1/conf/common.rmk 2009-11-21 21:39:50.001522883 +0100 +@@ -362,7 +362,7 @@ + read.mod sleep.mod loadenv.mod crc.mod parttool.mod \ + msdospart.mod memrw.mod normal.mod sh.mod \ + gptsync.mod true.mod probe.mod password.mod \ +- keystatus.mod ++ keystatus.mod 915resolution.mod + + # For password.mod. + password_mod_SOURCES = commands/password.c +@@ -608,3 +608,9 @@ + setjmp_mod_SOURCES = lib/$(target_cpu)/setjmp.S + setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS) + setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS) ++ ++# For 915resolution.mod. ++915resolution_mod_SOURCES = 915resolution/915resolution.c ++915resolution_mod_CFLAGS = $(COMMON_CFLAGS) ++915resolution_mod_LDFLAGS = $(COMMON_LDFLAGS) ++ |