diff options
| author | Matt Wilson <msw@redhat.com> | 2000-06-21 16:09:12 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2000-06-21 16:09:12 +0000 |
| commit | 79b13fa9ad1dafc3cdb1035a63f86ce746a20557 (patch) | |
| tree | 0cddc4801493c02632baade89968214213dd3163 /ddcprobe | |
| parent | 6bf41525b2355ce0de50b74f1d111c67e9033220 (diff) | |
| download | anaconda-79b13fa9ad1dafc3cdb1035a63f86ce746a20557.tar.gz anaconda-79b13fa9ad1dafc3cdb1035a63f86ce746a20557.tar.xz anaconda-79b13fa9ad1dafc3cdb1035a63f86ce746a20557.zip | |
hj patch 18r0-49
Diffstat (limited to 'ddcprobe')
| -rw-r--r-- | ddcprobe/ddcprobe.c | 12 | ||||
| -rw-r--r-- | ddcprobe/lrmi.c | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ddcprobe/ddcprobe.c b/ddcprobe/ddcprobe.c index 01467275b..d590b5e93 100644 --- a/ddcprobe/ddcprobe.c +++ b/ddcprobe/ddcprobe.c @@ -1,3 +1,4 @@ +#define _GNU_SOURCE #include <sys/types.h> #include <sys/io.h> #include <sys/stat.h> @@ -66,9 +67,14 @@ int main(int argc, char **argv) vbe_info->product_revision.string); } - /* Memory. */ - printf("Memory installed = %d * 64k blocks = %dkb\n", - vbe_info->memory_size, vbe_info->memory_size * 64); + if (strcasestr(vbe_info->oem_name.string, "intel") + && strstr(vbe_info->oem_name.string, "810")) { + printf("Intel 810 VESA video memory = %d * 64k blocks = %dkb. Use 4MB video memory.\n", + vbe_info->memory_size, vbe_info->memory_size * 64); + printf("Memory installed = 64 * 64k blocks = 4096kb\n"); + } else + printf("Memory installed = %d * 64k blocks = %dkb\n", + vbe_info->memory_size, vbe_info->memory_size * 64); /* List supported standard modes. */ mode_list = vbe_info->mode_list.list; diff --git a/ddcprobe/lrmi.c b/ddcprobe/lrmi.c index ca8af0a1e..ce13c1091 100644 --- a/ddcprobe/lrmi.c +++ b/ddcprobe/lrmi.c @@ -748,6 +748,7 @@ lrmi_vm86(struct vm86_struct *vm) #endif +#ifdef ORIGINAL_LRMI_CODE_THAT_GOT_IFDEFED_OUT static void debug_info(int vret) { @@ -782,7 +783,7 @@ debug_info(int vret) fputs("]\n", stderr); } - +#endif static int run_vm86(void) |