Le Sat, 15 Apr 2006 22:06:56 +1200 (NZST) Bart Oldeman
<bartoldeman@xxxxxxxxxxxxxxxxxxxxx> a écrit :
> >> You should compile dosemu-1.3.3 from dosemu.org.
> >> I'm afraid pci.h is too new for dosemu-1.2.2
> >
> > Doesn't work either :-( Same error, but from vga.c this time.
>
> #include <sys/pci.h> just seems to get broken at unrelated places again.
> As much as I would like that the headers would be fixed, that just doesn't
> seem to happen quickly enough...
>
> if you search and replace
>
> #include <sys/pci.h>
>
> with
>
> #define PCI_VENDOR_ID 0x00
> #define PCI_VENDOR_ID_INTEL 0x8086
> #define PCI_VENDOR_ID_COMPAQ 0x0e11
> #define PCI_BASE_ADDRESS_0 0x10
> #define PCI_BASE_ADDRESS_5 0x24
> #define PCI_BASE_ADDRESS_SPACE_IO 0x01
> #define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00
> #define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL)
> #define PCI_BASE_ADDRESS_IO_MASK (~0x03UL)
> #define PCI_ROM_ADDRESS 0x30
> #define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
> #define PCI_CLASS_DISPLAY_VGA 0x0300
> #define PCI_CLASS_BRIDGE_HOST 0x0600
> #define PCI_CLASS_DEVICE 0x0a
>
> you should be fine. That's what I did in the current SVN.
>
> Bart
It worked fine. I attached to this mail a patch file for anyone
interested.
Thanks.
(BTW, it didn't help so much for running UFO 1 : I had a crash at the end
of the introduction).
\bye
--
Nicolas FRANCOIS
http://nicolas.francois.free.fr
A TRUE Klingon programmer does NOT comment his code
diff -Naur dosemu-1.3.3/src/include/pci.h dosemu-1.3.3.new/src/include/pci.h
--- dosemu-1.3.3/src/include/pci.h 2005-12-10 05:41:58.000000000 +0100
+++ dosemu-1.3.3.new/src/include/pci.h 2006-04-15 14:21:51.000000000 +0200
@@ -7,7 +7,21 @@
#ifndef DOSEMU_PCI_H
#define DOSEMU_PCI_H
-#include <sys/pci.h>
+/* #include <sys/pci.h> */
+#define PCI_VENDOR_ID 0x00
+#define PCI_VENDOR_ID_INTEL 0x8086
+#define PCI_VENDOR_ID_COMPAQ 0x0e11
+#define PCI_BASE_ADDRESS_0 0x10
+#define PCI_BASE_ADDRESS_5 0x24
+#define PCI_BASE_ADDRESS_SPACE_IO 0x01
+#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00
+#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL)
+#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL)
+#define PCI_ROM_ADDRESS 0x30
+#define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
+#define PCI_CLASS_DISPLAY_VGA 0x0300
+#define PCI_CLASS_BRIDGE_HOST 0x0600
+#define PCI_CLASS_DEVICE 0x0a
#define PCIBIOS_PCI_FUNCTION_ID 0xb1
#define PCIBIOS_PCI_BIOS_PRESENT 0xb101
