diff options
| author | Paul Saab <ps@FreeBSD.org> | 2004-04-26 19:28:08 +0000 |
|---|---|---|
| committer | Paul Saab <ps@FreeBSD.org> | 2004-04-26 19:28:08 +0000 |
| commit | 609caf8db9ebbea1b23b16bf02c151b7d11be8a6 (patch) | |
| tree | 6f7d00febbc35a8efeb5d1b030d60e04b4f46f7c /sys/dev/ciss | |
| parent | 69e956d0a7836a7d05c0912356d5248696f0d80b (diff) | |
Notes
Diffstat (limited to 'sys/dev/ciss')
| -rw-r--r-- | sys/dev/ciss/ciss.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 74b195f74dc68..c11c28f334b68 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -1411,7 +1411,9 @@ ciss_accept_media(struct ciss_softc *sc, struct ciss_ldrive *ld, int async) struct ciss_request *cr; struct ciss_command *cc; struct ciss_bmic_cdb *cbc; - int error; + int error, ldrive; + + ldrive = CISS_LUN_TO_TARGET(ld->cl_address.logical.lun); debug(0, "bringing logical drive %d back online %ssynchronously", ldrive, async ? "a" : ""); @@ -1425,7 +1427,7 @@ ciss_accept_media(struct ciss_softc *sc, struct ciss_ldrive *ld, int async) cc = CISS_FIND_COMMAND(cr); cc->header.address = *ld->cl_controller; /* target controller */ cbc = (struct ciss_bmic_cdb *)&(cc->cdb.cdb[0]); - cbc->log_drive = CISS_LUN_TO_TARGET(ld->cl_address.logical.lun); + cbc->log_drive = ldrive; /* * Dispatch the request asynchronously if we can't sleep waiting @@ -3568,7 +3570,7 @@ ciss_print_ldrive(struct ciss_softc *sc, struct ciss_ldrive *ld) static void ciss_print_adapter(struct ciss_softc *sc) { - int i; + int i, j; ciss_printf(sc, "ADAPTER:\n"); for (i = 0; i < CISSQ_COUNT; i++) { @@ -3579,14 +3581,14 @@ ciss_print_adapter(struct ciss_softc *sc) sc->ciss_qstat[i].q_max); } ciss_printf(sc, "max_requests %d\n", sc->ciss_max_requests); - ciss_printf(sc, "notify_head/tail %d/%d\n", - sc->ciss_notify_head, sc->ciss_notify_tail); ciss_printf(sc, "flags %b\n", sc->ciss_flags, "\20\1notify_ok\2control_open\3aborting\4running\21fake_synch\22bmic_abort\n"); - for (i = 0; i < CISS_MAX_LOGICAL; i++) { - ciss_printf(sc, "LOGICAL DRIVE %d: ", i); - ciss_print_ldrive(sc, sc->ciss_logical + i); + for (i = 0; i < sc->ciss_max_bus_number; i++) { + for (j = 0; j < CISS_MAX_LOGICAL; j++) { + ciss_printf(sc, "LOGICAL DRIVE %d: ", i); + ciss_print_ldrive(sc, &sc->ciss_logical[i][j]); + } } for (i = 1; i < sc->ciss_max_requests; i++) |