diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2002-12-03 19:25:55 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2002-12-03 19:25:55 +0000 |
| commit | d4e304549399983fb953dd5f07070073ba867997 (patch) | |
| tree | 0efd71b559726ebbac9dc8f4599a86f3122732fe | |
| parent | d6842093c0f00d76fa350e2625114f9ce612b934 (diff) | |
Use bus_space_vaddr() instead of checking the mapping directly (this will
be necessary soon); from henric@
| -rw-r--r-- | sys/arch/sparc64/dev/creator_mainbus.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/creator_upa.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/sparc64/dev/creator_mainbus.c b/sys/arch/sparc64/dev/creator_mainbus.c index 1b1bbaf17b4..9f0089b405b 100644 --- a/sys/arch/sparc64/dev/creator_mainbus.c +++ b/sys/arch/sparc64/dev/creator_mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: creator_mainbus.c,v 1.4 2002/07/26 16:39:04 jason Exp $ */ +/* $OpenBSD: creator_mainbus.c,v 1.5 2002/12/03 19:25:54 jason Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net), @@ -122,10 +122,10 @@ creator_mainbus_attach(parent, self, aux) return; fail: - if (sc->sc_fbc_h != 0) + if (bus_space_vaddr(sc->sc_bt, sc->sc_fbc_h)) bus_space_unmap(sc->sc_bt, sc->sc_fbc_h, ma->ma_reg[FFB_REG_FBC].ur_len); - if (sc->sc_pixel_h != 0) + if (bus_space_vaddr(sc->sc_bt, sc->sc_pixel_h)) bus_space_unmap(sc->sc_bt, sc->sc_pixel_h, ma->ma_reg[FFB_REG_DFB24].ur_len); } diff --git a/sys/arch/sparc64/dev/creator_upa.c b/sys/arch/sparc64/dev/creator_upa.c index c9e9469bc40..2107b7aeee8 100644 --- a/sys/arch/sparc64/dev/creator_upa.c +++ b/sys/arch/sparc64/dev/creator_upa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: creator_upa.c,v 1.3 2002/07/26 16:39:04 jason Exp $ */ +/* $OpenBSD: creator_upa.c,v 1.4 2002/12/03 19:25:54 jason Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -121,10 +121,10 @@ creator_upa_attach(parent, self, aux) return; fail: - if (sc->sc_fbc_h != 0) + if (bus_space_vaddr(sc->sc_bt, sc->sc_fbc_h)) bus_space_unmap(sc->sc_bt, sc->sc_fbc_h, ma->ma_reg[FFB_REG_FBC].ur_len); - if (sc->sc_pixel_h != 0) + if (bus_space_vaddr(sc->sc_bt, sc->sc_pixel_h)) bus_space_unmap(sc->sc_bt, sc->sc_pixel_h, ma->ma_reg[FFB_REG_DFB24].ur_len); } |