Re: CARDBUS i386 build problem, or just me?

[Robert Swindells <rjs%fdy2.demon.co.uk@localhost>]

barry bouwsma wrote:
>I'm having problems when building -current for some weeks, building
>the supplied CARDBUS conf file -- GENERIC is okay, as well as a
>custom-kernel derived from my last-working kernel of years ago that
>should reflect my hardware.
>
>I haven't tried building any other predefined config files, on i386.
>
>I get a failure when crossbuilding under Linux, source file
>src/sys/dev/cardbus/rbus_ppb.c like so:

<snip>

>*** Failed target:  rbus_ppb.o
>
>This file #includes
>     64 #include <dev/ic/i82365var.h>
>and
>     67 #include <dev/pci/pccbbvar.h>
>both of which, from the latter, define
>     70 struct pcic_handle {
>     71         /* extracted from i82365var.h */
>rather differently.
>
>Is it possible my source is out-of-sync or something?

No, it fails to compile on a native build too, you are not doing
anything wrong.

Looking at the history for dev/pci/pccbb.c, the fix is probably to
remove the reference to <dev/ic/i82365var.h> from rbus_ppb.c, it does
build with this change:

Index: rbus_ppb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/cardbus/rbus_ppb.c,v
retrieving revision 1.25
diff -u -r1.25 rbus_ppb.c
--- rbus_ppb.c  9 Jul 2008 18:18:56 -0000       1.25
+++ rbus_ppb.c  20 Jul 2008 21:50:19 -0000
@@ -61,7 +61,6 @@
 #include <dev/pci/ppbreg.h>
 
 #include <dev/ic/i82365reg.h>
-#include <dev/ic/i82365var.h>
 
 #include <dev/pci/pccbbreg.h>
 #include <dev/pci/pccbbvar.h>