summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2004-08-25 09:04:51 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2004-08-25 09:04:51 +0000
commit491e123fb65a388a36b8ad81a7b5fbd7deca44e1 (patch)
treeafe3b08f39e423ec4270df6a5212dd9bc5dae1d8
parent68ebb33c2ef601daea8bddcba0dd30bd27e06895 (diff)
downloaddrakx-491e123fb65a388a36b8ad81a7b5fbd7deca44e1.tar
drakx-491e123fb65a388a36b8ad81a7b5fbd7deca44e1.tar.gz
drakx-491e123fb65a388a36b8ad81a7b5fbd7deca44e1.tar.bz2
drakx-491e123fb65a388a36b8ad81a7b5fbd7deca44e1.tar.xz
drakx-491e123fb65a388a36b8ad81a7b5fbd7deca44e1.zip
Some cleanups
-rw-r--r--tools/ddcprobe/Makefile2
-rw-r--r--tools/ddcprobe/ddcxinfos.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/tools/ddcprobe/Makefile b/tools/ddcprobe/Makefile
index 00e43ce68..6f2f3f4e9 100644
--- a/tools/ddcprobe/Makefile
+++ b/tools/ddcprobe/Makefile
@@ -19,7 +19,7 @@ OBJS = ddcxinfos.o vesamode.o vbe.o
LIBS = libint10.a libx86emu.a
endif
ifeq (ppc,$(ARCH))
-OBJS = ddcxinfos.o vesamode.o of.o minifind.o
+OBJS = ddcxinfos.o of.o minifind.o
endif
ifeq (,$(OBJS))
OBJS = not_handled.o
diff --git a/tools/ddcprobe/ddcxinfos.c b/tools/ddcprobe/ddcxinfos.c
index 93352d846..7807ebf16 100644
--- a/tools/ddcprobe/ddcxinfos.c
+++ b/tools/ddcprobe/ddcxinfos.c
@@ -9,7 +9,14 @@
#include <stdarg.h>
#include "vbe.h"
#include "vesamode.h"
+
+#if defined(__i386__) || defined(__x86_64__)
#include "int10/vbios.h"
+#else
+#define InitInt10(PCI_CONFIG) 0
+#define FreeInt10() /**/
+#endif
+
#ident "$Id$"
#define SQR(x) ((x) * (x))
@@ -47,6 +54,7 @@ int main(void)
printf("%dKB of video ram\n", vbe_info->memory_size / 1024);
/* List supported standard modes */
+#if defined(__i386__) || defined(__x86_64__)
for (j = 0; j < vbe_info->modes; j++)
for (i = 0; known_vesa_modes[i].x; i++)
if (known_vesa_modes[i].number == vbe_info->mode_list[j])
@@ -56,6 +64,7 @@ int main(void)
known_vesa_modes[i].y
);
printf("\n");
+#endif
/* Get EDID information */
if (vbe_get_edid_info(edid) == 0) {