Compile on amd64. (pointer/int mismatches and printf int vs long )

This commit is contained in:
Peter Wemm 2004-02-05 01:35:33 +00:00
parent db41012cc3
commit 668329e94b

View File

@ -2103,11 +2103,11 @@ safe_dump_ringstate(struct safe_softc *sc, const char *tag)
u_int32_t estat = READ_REG(sc, SAFE_PE_ERNGSTAT); u_int32_t estat = READ_REG(sc, SAFE_PE_ERNGSTAT);
/* NB: assume caller has lock on ring */ /* 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, tag,
estat, (estat >> SAFE_PE_ERNGSTAT_NEXT_S), estat, (estat >> SAFE_PE_ERNGSTAT_NEXT_S),
sc->sc_back - sc->sc_ring, (unsigned long)(sc->sc_back - sc->sc_ring),
sc->sc_front - sc->sc_ring); (unsigned long)(sc->sc_front - sc->sc_ring));
} }
static void 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--) { for (nsegs = re->re_src.nsegs; nsegs; nsegs--) {
printf(" spd[%u] %p: %p size %u flags %x" printf(" spd[%u] %p: %p size %u flags %x"
, ix, &sc->sc_spring[ix] , 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_size
, sc->sc_spring[ix].pd_flags , 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--) { for (nsegs = re->re_dst.nsegs; nsegs; nsegs--) {
printf(" dpd[%u] %p: %p flags %x\n" printf(" dpd[%u] %p: %p flags %x\n"
, ix, &sc->sc_dpring[ix] , 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 , sc->sc_dpring[ix].pd_flags
); );
if (++ix == SAFE_TOTAL_DPART) if (++ix == SAFE_TOTAL_DPART)