diff options
| author | peter <peter@FreeBSD.org> | 2004-02-05 01:35:33 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2004-02-05 01:35:33 +0000 |
| commit | 9a226ff388c34edb12ae278cd6e5f3357fe6796a (patch) | |
| tree | 173e586381153661d0e15abb600a5986102487ce /sys/dev/safe | |
| parent | 5c36d6176edf8c5a83fb668b14a08d613558debc (diff) | |
| download | FreeBSD-src-9a226ff388c34edb12ae278cd6e5f3357fe6796a.zip FreeBSD-src-9a226ff388c34edb12ae278cd6e5f3357fe6796a.tar.gz | |
Compile on amd64. (pointer/int mismatches and printf int vs long )
Diffstat (limited to 'sys/dev/safe')
| -rw-r--r-- | sys/dev/safe/safe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c index b06ba76..015eb8e 100644 --- a/sys/dev/safe/safe.c +++ b/sys/dev/safe/safe.c @@ -2103,11 +2103,11 @@ safe_dump_ringstate(struct safe_softc *sc, const char *tag) u_int32_t estat = READ_REG(sc, SAFE_PE_ERNGSTAT); /* NB: assume caller has lock on ring */ - printf("%s: ERNGSTAT %x (next %u) back %u front %u\n", + printf("%s: ERNGSTAT %x (next %u) back %lu front %lu\n", tag, estat, (estat >> SAFE_PE_ERNGSTAT_NEXT_S), - sc->sc_back - sc->sc_ring, - sc->sc_front - sc->sc_ring); + (unsigned long)(sc->sc_back - sc->sc_ring), + (unsigned long)(sc->sc_front - sc->sc_ring)); } static void @@ -2131,7 +2131,7 @@ safe_dump_request(struct safe_softc *sc, const char* tag, struct safe_ringentry for (nsegs = re->re_src.nsegs; nsegs; nsegs--) { printf(" spd[%u] %p: %p size %u flags %x" , ix, &sc->sc_spring[ix] - , (caddr_t) sc->sc_spring[ix].pd_addr + , (caddr_t)(uintptr_t) sc->sc_spring[ix].pd_addr , sc->sc_spring[ix].pd_size , sc->sc_spring[ix].pd_flags ); @@ -2148,7 +2148,7 @@ safe_dump_request(struct safe_softc *sc, const char* tag, struct safe_ringentry for (nsegs = re->re_dst.nsegs; nsegs; nsegs--) { printf(" dpd[%u] %p: %p flags %x\n" , ix, &sc->sc_dpring[ix] - , (caddr_t) sc->sc_dpring[ix].pd_addr + , (caddr_t)(uintptr_t) sc->sc_dpring[ix].pd_addr , sc->sc_dpring[ix].pd_flags ); if (++ix == SAFE_TOTAL_DPART) |
