ddcxinfo-arch/lrmi-vm86.patch

   1 diff -Naur ddcxinfo-arch-0.8/Makefile ddcxinfo-arch-0.8-new/Makefile
   2 --- ddcxinfo-arch-0.8/Makefile  2004-12-01 01:29:20.000000000 -0500
   3 +++ ddcxinfo-arch-0.8-new/Makefile      2009-03-02 00:01:28.000000000 -0500
   4 @@ -1,4 +1,5 @@
   5  CFLAGS=-Wall -O2 -g #-DDEBUG #-DORIGINAL_LRMI_CODE_THAT_GOT_IFDEFED_OUT
   6 +LDFLAGS= -L/usr/lib -lx86
   7
   8  TARGETS=ddcprobe svgamodes ddcxinfo ddcxinfo-knoppix ddcxinfo-arch modetest libvbe.a
   9
  10 @@ -15,19 +16,19 @@
  11  install: $(TARGETS)
  12         cp -a ddcprobe $(DESTDIR)/usr/sbin/ddcprobe
  13
  14 -ddcprobe: lrmi.o vesamode.o vbe.o ddcprobe.o
  15 +ddcprobe: vesamode.o vbe.o ddcprobe.o
  16
  17 -svgamodes: lrmi.o vesamode.o vbe.o svgamodes.o
  18 +svgamodes: vesamode.o vbe.o svgamodes.o
  19
  20 -ddcxinfo: lrmi.o vesamode.o vbe.o ddcxinfo.o
  21 +ddcxinfo: vesamode.o vbe.o ddcxinfo.o
  22
  23 -ddcxinfo-knoppix: lrmi.o vesamode.o vbe.o ddcxinfo-knoppix.o
  24 +ddcxinfo-knoppix: vesamode.o vbe.o ddcxinfo-knoppix.o
  25
  26 -ddcxinfo-arch: lrmi.o vesamode.o vbe.o ddcxinfo-arch.o
  27 +ddcxinfo-arch: vesamode.o vbe.o ddcxinfo-arch.o
  28
  29 -modetest: lrmi.o vesamode.o vbe.o modetest.o
  30 +modetest: vesamode.o vbe.o modetest.o
  31
  32 -libvbe.a: lrmi.o vesamode.o vbe.o
  33 +libvbe.a: vesamode.o vbe.o
  34         $(AR) cru $@ $^
  35
  36  install-lib: $(prefix)/include/vbe.h $(prefix)/lib/libvbe.a
  37 diff -Naur ddcxinfo-arch-0.8/bioscall.c ddcxinfo-arch-0.8-new/bioscall.c
  38 --- ddcxinfo-arch-0.8/bioscall.c        2004-12-01 01:29:20.000000000 -0500
  39 +++ ddcxinfo-arch-0.8-new/bioscall.c    2009-03-02 00:01:28.000000000 -0500
  40 @@ -1,7 +1,7 @@
  41  #include <sys/types.h>
  42  #include <sys/io.h>
  43  #include <sys/stat.h>
  44 -#include <sys/vm86.h>
  45 +//#include <sys/vm86.h>
  46  #include <sys/syscall.h>
  47  #include <sys/mman.h>
  48  #include <ctype.h>
  49 diff -Naur ddcxinfo-arch-0.8/ddcprobe.c ddcxinfo-arch-0.8-new/ddcprobe.c
  50 --- ddcxinfo-arch-0.8/ddcprobe.c        2004-12-01 01:29:20.000000000 -0500
  51 +++ ddcxinfo-arch-0.8-new/ddcprobe.c    2009-03-02 00:02:29.000000000 -0500
  52 @@ -2,7 +2,7 @@
  53  #include <sys/types.h>
  54  #include <sys/io.h>
  55  #include <sys/stat.h>
  56 -#include <sys/vm86.h>
  57 +//#include <sys/vm86.h>
  58  #include <sys/syscall.h>
  59  #include <sys/mman.h>
  60  #include <assert.h>
  61 @@ -16,7 +16,7 @@
  62  #include <netinet/in.h>
  63  #include "vbe.h"
  64  #include "vesamode.h"
  65 -#include "lrmi.h"
  66 +#include <libx86.h>
  67  //#ident "$Id: ddcprobe.c,v 1.10 2000/08/09 15:13:37 notting Exp $"
  68
  69  char *snip(char *string)
  70 diff -Naur ddcxinfo-arch-0.8/ddcxinfo-arch.c ddcxinfo-arch-0.8-new/ddcxinfo-arch.c
  71 --- ddcxinfo-arch-0.8/ddcxinfo-arch.c   2004-12-01 01:29:20.000000000 -0500
  72 +++ ddcxinfo-arch-0.8-new/ddcxinfo-arch.c       2009-03-02 00:01:28.000000000 -0500
  73 @@ -2,7 +2,7 @@
  74  #include <stdlib.h>
  75  #include <string.h>
  76  #include "vbe.h"
  77 -#include "lrmi.h"
  78 +#include <libx86.h>
  79  /************* This is derived from ddcxinfo written by *****************\
  80  #ident "$Id: ddcxinfo.c,v 1.7 1999/08/24 01:08:47 nalin Exp $"
  81  modified by Klaus Knopper <knoppix@knopper.net> for KNOPPIX Feb. 2003
  82 diff -Naur ddcxinfo-arch-0.8/svgamodes.c ddcxinfo-arch-0.8-new/svgamodes.c
  83 --- ddcxinfo-arch-0.8/svgamodes.c       2004-12-01 01:29:20.000000000 -0500
  84 +++ ddcxinfo-arch-0.8-new/svgamodes.c   2009-03-02 00:03:45.000000000 -0500
  85 @@ -1,7 +1,7 @@
  86  #include <sys/types.h>
  87  #include <sys/io.h>
  88  #include <sys/stat.h>
  89 -#include <sys/vm86.h>
  90 +//#include <sys/vm86.h>
  91  #include <sys/syscall.h>
  92  #include <sys/mman.h>
  93  #include <assert.h>
  94 @@ -15,7 +15,7 @@
  95  #include <netinet/in.h>
  96  #include "vbe.h"
  97  #include "vesamode.h"
  98 -#include "lrmi.h"
  99 +#include <libx86.h>
 100  #ident "$Id: svgamodes.c,v 1.5 1999/08/24 01:08:47 nalin Exp $"
 101
 102  /*
 103 diff -Naur ddcxinfo-arch-0.8/vbe.c ddcxinfo-arch-0.8-new/vbe.c
 104 --- ddcxinfo-arch-0.8/vbe.c     2004-12-01 01:29:20.000000000 -0500
 105 +++ ddcxinfo-arch-0.8-new/vbe.c 2009-03-02 00:01:28.000000000 -0500
 106 @@ -8,7 +8,7 @@
 107  #include <assert.h>
 108  #include <limits.h>
 109  #include <ctype.h>
 110 -#include "lrmi.h"
 111 +#include <libx86.h>
 112  #include "vesamode.h"
 113  #include "vbe.h"
 114  #ident "$Id: vbe.c,v 1.9 2002/01/04 02:29:30 notting Exp $"