diff options
| author | imp <imp@FreeBSD.org> | 2004-07-03 20:48:01 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2004-07-03 20:48:01 +0000 |
| commit | 02ebd4587c3c711f6807c8daaaba8be46f9afbda (patch) | |
| tree | b4d846d8c5843671489367323b32a50ff7f01e03 | |
| parent | e1b4f764481e523a6e42927992ccd8901a5a6660 (diff) | |
| download | FreeBSD-src-02ebd4587c3c711f6807c8daaaba8be46f9afbda.zip FreeBSD-src-02ebd4587c3c711f6807c8daaaba8be46f9afbda.tar.gz | |
Use the rman_* functions in preference to reaching into struct resource.
Remove __RMAN_RESOURCE_VISIBLE after compilation confirms it is now not
needed.
| -rw-r--r-- | sys/sparc64/fhc/fhc.c | 4 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/nexus.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/sparc64/fhc/fhc.c b/sys/sparc64/fhc/fhc.c index e6cde2a..883fb28 100644 --- a/sys/sparc64/fhc/fhc.c +++ b/sys/sparc64/fhc/fhc.c @@ -237,7 +237,7 @@ fhc_setup_intr(device_t bus, device_t child, struct resource *r, int flags, fc->fc_bh = sc->sc_bh[rid]; bus_space_write_4(sc->sc_bt[rid], sc->sc_bh[rid], FHC_IMAP, - r->r_start); + rman_get_start(r)); bus_space_read_4(sc->sc_bt[rid], sc->sc_bh[rid], FHC_IMAP); error = bus_generic_setup_intr(bus, child, r, flags, fhc_intr_stub, @@ -251,7 +251,7 @@ fhc_setup_intr(device_t bus, device_t child, struct resource *r, int flags, bus_space_write_4(sc->sc_bt[rid], sc->sc_bh[rid], FHC_ICLR, 0x0); bus_space_write_4(sc->sc_bt[rid], sc->sc_bh[rid], FHC_IMAP, - INTMAP_ENABLE(r->r_start, PCPU_GET(mid))); + INTMAP_ENABLE(rman_get_start(r), PCPU_GET(mid))); bus_space_read_4(sc->sc_bt[rid], sc->sc_bh[rid], FHC_IMAP); return (error); diff --git a/sys/sparc64/sparc64/nexus.c b/sys/sparc64/sparc64/nexus.c index 244cd57..5e282e3 100644 --- a/sys/sparc64/sparc64/nexus.c +++ b/sys/sparc64/sparc64/nexus.c @@ -288,7 +288,7 @@ nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, if (res == NULL) panic("nexus_setup_intr: NULL interrupt resource!"); - if ((res->r_flags & RF_SHAREABLE) == 0) + if ((rman_get_flags(res) & RF_SHAREABLE) == 0) flags |= INTR_EXCL; /* We depend here on rman_activate_resource() being idempotent. */ @@ -296,7 +296,7 @@ nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, if (error) return (error); - error = inthand_add(device_get_nameunit(child), res->r_start, + error = inthand_add(device_get_nameunit(child), rman_get_start(res), intr, arg, flags, cookiep); return (error); @@ -305,7 +305,7 @@ nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, static int nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih) { - inthand_remove(r->r_start, ih); + inthand_remove(rman_get_start(r), ih); return (0); } |
