Re: Anyone tried building 2.9 with WDCDEBUG defined ?

[Hakan Olsson <ho@crt.se>]

It's been fixed in -current. You want the following:

(Output from 'cvs -q diff -u -r1.51 -r1.52 pciide.c')

Index: pciide.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/pciide.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- pciide.c    2001/04/17 22:43:50     1.51
+++ pciide.c    2001/05/22 15:32:38     1.52
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pciide.c,v 1.51 2001/04/17 22:43:50 chris Exp $     */
+/*      $OpenBSD: pciide.c,v 1.52 2001/05/22 15:32:38 ho Exp $     */
 /*     $NetBSD: pciide.c,v 1.110 2001/03/20 17:56:46 bouyer Exp $      */

 /*
@@ -568,7 +568,7 @@

 #ifdef WDCDEBUG
        if (wdcdebug_pciide_mask & DEBUG_PROBE)
-               printf("sc_pc %s, sc_tag %s\n", sc->sc_pc, sc->sc_tag);
+               printf(" sc_pc %p, sc_tag %p\n", sc->sc_pc, sc->sc_tag);
 #endif

        sc->sc_pp->chip_map(sc, pa);
@@ -985,8 +985,8 @@
                    htole32(dma_maps->dmamap_xfer->dm_segs[seg].ds_len &
                    IDEDMA_BYTE_COUNT_MASK);
                WDCDEBUG_PRINT(("\t seg %d len %d addr 0x%x\n",
-                  seg, le32toh(dma_maps->dma_table[seg].byte_count),
-                  le32toh(dma_maps->dma_table[seg].base_addr)), DEBUG_DMA);
+                  seg, letoh32(dma_maps->dma_table[seg].byte_count),
+                  letoh32(dma_maps->dma_table[seg].base_addr)), DEBUG_DMA);

        }
        dma_maps->dma_table[dma_maps->dmamap_xfer->dm_nsegs -1].byte_count |=
@@ -3177,7 +3177,7 @@
                pci_conf_write(sc->sc_pc, sc->sc_tag,
                    HPT_IDETIM(chp->channel, drive), after);
                WDCDEBUG_PRINT(("%s: bus speed register set to 0x%08x "
-                   "(BIOS 0x%08x)\n", drvp->drv_softc->dv_xname,
+                   "(BIOS 0x%08x)\n", sc->sc_wdcdev.sc_dev.dv_xname,
                    after, before), DEBUG_PROBE);
        }
        if (idedma_ctl != 0) {

//H

--
Håkan Olsson <ho@crt.se>        (+46) 708 437 337     Carlstedt Research
Unix, Networking, Security      (+46) 31 701 4264        & Technology AB