Deleted Added
full compact
27c27
< * $FreeBSD: head/sys/dev/ciss/ciss.c 232854 2012-03-12 08:03:51Z scottl $
---
> * $FreeBSD: head/sys/dev/ciss/ciss.c 245459 2013-01-15 14:35:35Z sbruno $
1205a1206,1215
> /*
> * Earlier controller specs do not contain these config
> * entries, so assume that a 0 means its old and assign
> * these values to the defaults that were established
> * when this driver was developed for them
> */
> if (sc->ciss_cfg->max_logical_supported == 0)
> sc->ciss_cfg->max_logical_supported = CISS_MAX_LOGICAL;
> if (sc->ciss_cfg->max_physical_supported == 0)
> sc->ciss_cfg->max_physical_supported = CISS_MAX_PHYSICAL;
1208d1217
< #if 0 /* XXX proxy volumes??? */
1212d1220
< #endif
1234a1243,1245
> ciss_printf(sc, " max logical logical volumes: %d\n", sc->ciss_cfg->max_logical_supported);
> ciss_printf(sc, " max physical disks supported: %d\n", sc->ciss_cfg->max_physical_supported);
> ciss_printf(sc, " max physical disks per logical volume: %d\n", sc->ciss_cfg->max_physical_per_logical);
1322c1333
< CISS_MAX_LOGICAL);
---
> sc->ciss_cfg->max_logical_supported);
1356c1367
< CISS_MAX_LOGICAL);
---
> sc->ciss_cfg->max_logical_supported);
1364c1375
< if ((ndrives < 0) || (ndrives > CISS_MAX_LOGICAL)) {
---
> if ((ndrives < 0) || (ndrives > sc->ciss_cfg->max_logical_supported)) {
1366c1377
< ndrives, CISS_MAX_LOGICAL);
---
> ndrives, sc->ciss_cfg->max_logical_supported);
1389c1400,1401
< malloc(CISS_MAX_LOGICAL * sizeof(struct ciss_ldrive),
---
> malloc(sc->ciss_cfg->max_logical_supported *
> sizeof(struct ciss_ldrive),
1396c1408
< for (j = 0; j < CISS_MAX_LOGICAL; j++)
---
> for (j = 0; j < sc->ciss_cfg->max_logical_supported; j++)
1401c1413
< for (i = 0; i < CISS_MAX_LOGICAL; i++) {
---
> for (i = 0; i < sc->ciss_cfg->max_logical_supported; i++) {
1443c1455
< CISS_MAX_PHYSICAL);
---
> sc->ciss_cfg->max_physical_supported);
1986c1998
< for (j = 0; j < CISS_MAX_LOGICAL; j++) {
---
> for (j = 0; j < sc->ciss_cfg->max_logical_supported; j++) {
2969c2981
< cpi->max_target = CISS_MAX_LOGICAL;
---
> cpi->max_target = sc->ciss_cfg->max_logical_supported;
2971c2983
< cpi->initiator_id = CISS_MAX_LOGICAL;
---
> cpi->initiator_id = sc->ciss_cfg->max_logical_supported;
3882c3894
< CISS_MAX_LOGICAL);
---
> sc->ciss_cfg->max_logical_supported);
3893c3905
< for (j = 0; j < CISS_MAX_LOGICAL; j++) {
---
> for (j = 0; j < sc->ciss_cfg->max_logical_supported; j++) {
4062c4074
< CISS_MAX_PHYSICAL);
---
> sc->ciss_cfg->max_physical_supported);
4310c4322
< for (j = 0; j < CISS_MAX_LOGICAL; j++) {
---
> for (j = 0; j < sc->ciss_cfg->max_logical_supported; j++) {