monitor-get-edid-using-vbe:

o remove all x86emu and vga softbootloader code, and always use the
  LRMI interface which was previously the backup one on 32-bit x86;
  libx86 is now used instead of liblrmi, allowing the use of LRMI
  interface on non-x86 hosts as well (fixes Mandriva bug #53866, which
  was caused by a bug in the removed code)

1 files changed, 3 insertions, 17 deletions

diff --git a/monitor-get-edid-using-vbe.c b/monitor-get-edid-using-vbe.c
index c4f2c08..1bf0759 100644
--- a/monitor-get-edid-using-vbe.c
+++ b/monitor-get-edid-using-vbe.c
@@ -10,7 +10,6 @@
 #include <sys/ioctl.h>
 #include <sys/vt.h>
 #include "get-edid.h"
-#include "hd.h"
 
 int verbose = 0;
 
@@ -21,32 +20,19 @@ int main(int argc, char **argv)
   int port = 0;
   int i;
 
-  /* Hardware Data defaults */
-  hd_data_t hd_data;
-  hd_data.flags.biosvram = 0;	/* don't map video BIOS RAM */
-  hd_data.flags.nobioscrc = 1;	/* don't check VBIOS CRC */
-  hd_data.flags.cpuemu = 1;		/* use CPU emulator everywhere... */
-#ifdef __i386__
-  hd_data.flags.cpuemu = 0;		/* ... but ia32, unless VBIOS CRC is invalid */
-#endif
-
   for (i = 1; i < argc; i++) {
 	const char *arg = argv[i];
     if (strcmp(arg, "-v") == 0) verbose = 1;
     else if (strcmp(arg, "--port") == 0 && i+1 < argc) port = atoi(argv[++i]);
     else if (strcmp(arg, "--try-in-console") == 0) try_in_console = 1;
-    else if (strcmp(arg, "--map-bios-vram") == 0) hd_data.flags.biosvram = 1;
-	else if (strcmp(arg, "--check-bios-crc") == 0) hd_data.flags.nobioscrc = 0;
-	else if (strcmp(arg, "--use-cpuemu") == 0) hd_data.flags.cpuemu = 1;
     else if (strcmp(arg, "-h") == 0 ||
 	     strcmp(arg, "--help") == 0) {
-      printf("usage: monitor-get-edid [-v] [--port <0-3>] [--try-in-console]\n"
-	     "       [--map-bios-vram] [--check-bios-crc] [--use-cpuemu]\n");
+      printf("usage: monitor-get-edid [-v] [--port <0-3>] [--try-in-console]\n");
       exit(1);
     }
   }
 
-  int size = get_edid(&hd_data, edid, port);
+  int size = get_edid(edid, port);
 
   if (!size && try_in_console) {
     int non_X_console = 1;
@@ -59,7 +45,7 @@ int main(int argc, char **argv)
 	ioctl(fd, VT_ACTIVATE, non_X_console) == 0 &&
 	ioctl(fd, VT_WAITACTIVE, non_X_console) == 0) {
       /* retrying */
-      size = get_edid(&hd_data, edid, port);
+      size = get_edid(edid, port);
 
       /* restore */
       ioctl(fd, VT_ACTIVATE, current.v_active) == 0 &&