armv7 kernel will fail to compile with -DSDHC_DEBUG as it lacks a definition for ommc_dump_regs, so add it.
I previously mailed this patch a while ago[1], but my mail client fudged tabs/whitespace, here is a working patch. Ian [1] http://marc.info/?l=openbsd-tech&m=143580188423401&w=2 Index: omap/ommmc.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/omap/ommmc.c,v retrieving revision 1.14 diff -u -p -r1.14 ommmc.c --- omap/ommmc.c 30 May 2015 02:17:36 -0000 1.14 +++ omap/ommmc.c 16 Aug 2015 22:01:31 -0000 @@ -244,7 +244,41 @@ void ommmc_write_data(struct ommmc_softc #ifdef SDHC_DEBUG int ommmcdebug = 20; #define DPRINTF(n,s) do { if ((n) <= ommmcdebug) printf s; } while (0) -void ommmc_dump_regs(struct ommmc_softc *); +void +ommmc_dump_regs(struct ommmc_softc *) +{ + DPRINTF(3,("%s: SYSCONFIG: 0x%08x SYSSTATUS: 0x%08x CSRE: 0x%08x\n", + DEVNAME(sc), HREAD4(sc, MMCHS_SYSCONFIG), HREAD4(sc, MMCHS_SYSSTATUS), + HREAD4(sc, MMCHS_CSRE))); + + DPRINTF(3,("%s: SYSTEST: 0x%08x CON: 0x%08x PWCNT: 0x%08x\n", + DEVNAME(sc), HREAD4(sc, MMCHS_SYSTEST), HREAD4(sc, MMCHS_CON), + HREAD4(sc, MMCHS_PWCNT))); + + DPRINTF(3,("%s: BLK: 0x%08x ARG: 0x%08x CMD: 0x%08x\n", + DEVNAME(sc), HREAD4(sc, MMCHS_BLK), HREAD4(sc, MMCHS_ARG), + HREAD4(sc, MMCHS_CMD))); + + DPRINTF(3,("%s: RSP10: 0x%08x RSP32: 0x%08x RSP54: 0x%08x\n", + DEVNAME(sc), HREAD4(sc, MMCHS_RSP10), HREAD4(sc, MMCHS_RSP32), + HREAD4(sc, MMCHS_RSP54))); + + DPRINTF(3,("%s: RSP76: 0x%08x DATA: 0x%08x PSTATE: 0x%08x\n", + DEVNAME(sc), HREAD4(sc, MMCHS_RSP76), HREAD4(sc, MMCHS_DATA), + HREAD4(sc, MMCHS_PSTATE))); + + DPRINTF(3,("%s: HCTL: 0x%08x SYSCTL: 0x%08x STAT: 0x%08x\n", + DEVNAME(sc), HREAD4(sc, MMCHS_HCTL), HREAD4(sc, MMCHS_SYSCTL), + HREAD4(sc, MMCHS_STAT))); + + DPRINTF(3,("%s: IE: 0x%08x ISE: 0x%08x AC12: 0x%08x\n", + DEVNAME(sc), HREAD4(sc, MMCHS_IE), HREAD4(sc, MMCHS_ISE), + HREAD4(sc, MMCHS_AC12))); + + DPRINTF(3,("%s: CAPA: 0x%08x CUR_CAPA: 0x%08x REV: 0x%08x\n", + DEVNAME(sc), HREAD4(sc, MMCHS_CAPA), HREAD4(sc, MMCHS_CUR_CAPA), + HREAD4(sc, MMCHS_REV))); +} #else #define DPRINTF(n,s) do {} while(0) #endif
