Attachment #13206 for bug #25254

View | Details | Raw Unified | Return to bug 25254
Collapse All | Expand All





	softc->devs.ctl_dev = make_dev(&sa_cdevsw, SAMINOR(SA_CTLDEV,
	    periph->unit_number, 0, SA_ATYPE_R), UID_ROOT, GID_OPERATOR,
	    0660, "%s%d.ctl", periph->periph_name, periph->unit_number);

	for (i = 0; i < SA_NUM_MODES; i++) {

		softc->devs.mode_devs[i].r_dev = make_dev(&sa_cdevsw,
		    SAMINOR(SA_NOT_CTLDEV, periph->unit_number, i, SA_ATYPE_R),
		    UID_ROOT, GID_OPERATOR, 0660, "%s%d.%d",
		    periph->periph_name, periph->unit_number, i);

		softc->devs.mode_devs[i].nr_dev = make_dev(&sa_cdevsw,
		    SAMINOR(SA_NOT_CTLDEV, periph->unit_number, i, SA_ATYPE_NR),
		    UID_ROOT, GID_OPERATOR, 0660, "n%s%d.%d",
		    periph->periph_name, periph->unit_number, i);


		softc->devs.mode_devs[i].er_dev = make_dev(&sa_cdevsw,
		    SAMINOR(SA_NOT_CTLDEV, periph->unit_number, i, SA_ATYPE_ER),
		    UID_ROOT, GID_OPERATOR, 0660, "e%s%d.%d",
		    periph->periph_name, periph->unit_number, i);

		/*

		 */
		if (i == 0) {
			make_dev_alias(softc->devs.mode_devs[i].r_dev,
			    "%s%d", periph->periph_name, periph->unit_number);
			make_dev_alias(softc->devs.mode_devs[i].nr_dev,
			    "n%s%d", periph->periph_name, periph->unit_number);
			make_dev_alias(softc->devs.mode_devs[i].er_dev,
			    "e%s%d", periph->periph_name, periph->unit_number);
		}
	}

Return to bug 25254

Lines 1467-1490 Link Here

(-)sys/cam/scsi/scsi_sa.c (-7 / +7 lines)
1467		1467
1468	softc->devs.ctl_dev = make_dev(&sa_cdevsw, SAMINOR(SA_CTLDEV,	1468	softc->devs.ctl_dev = make_dev(&sa_cdevsw, SAMINOR(SA_CTLDEV,
1469	periph->unit_number, 0, SA_ATYPE_R), UID_ROOT, GID_OPERATOR,	1469	periph->unit_number, 0, SA_ATYPE_R), UID_ROOT, GID_OPERATOR,
1470	0660, "r%s%d.ctl", periph->periph_name, periph->unit_number);	1470	0660, "%s%d.ctl", periph->periph_name, periph->unit_number);
1471		1471
1472	for (i = 0; i < SA_NUM_MODES; i++) {	1472	for (i = 0; i < SA_NUM_MODES; i++) {
1473		1473
1474	softc->devs.mode_devs[i].r_dev = make_dev(&sa_cdevsw,	1474	softc->devs.mode_devs[i].r_dev = make_dev(&sa_cdevsw,
1475	SAMINOR(SA_NOT_CTLDEV, periph->unit_number, i, SA_ATYPE_R),	1475	SAMINOR(SA_NOT_CTLDEV, periph->unit_number, i, SA_ATYPE_R),
1476	UID_ROOT, GID_OPERATOR, 0660, "r%s%d.%d",	1476	UID_ROOT, GID_OPERATOR, 0660, "%s%d.%d",
1477	periph->periph_name, periph->unit_number, i);	1477	periph->periph_name, periph->unit_number, i);
1478		1478
1479	softc->devs.mode_devs[i].nr_dev = make_dev(&sa_cdevsw,	1479	softc->devs.mode_devs[i].nr_dev = make_dev(&sa_cdevsw,
1480	SAMINOR(SA_NOT_CTLDEV, periph->unit_number, i, SA_ATYPE_NR),	1480	SAMINOR(SA_NOT_CTLDEV, periph->unit_number, i, SA_ATYPE_NR),
1481	UID_ROOT, GID_OPERATOR, 0660, "nr%s%d.%d",	1481	UID_ROOT, GID_OPERATOR, 0660, "n%s%d.%d",
1482	periph->periph_name, periph->unit_number, i);	1482	periph->periph_name, periph->unit_number, i);
1483		1483
1484		1484
1485	softc->devs.mode_devs[i].er_dev = make_dev(&sa_cdevsw,	1485	softc->devs.mode_devs[i].er_dev = make_dev(&sa_cdevsw,
1486	SAMINOR(SA_NOT_CTLDEV, periph->unit_number, i, SA_ATYPE_ER),	1486	SAMINOR(SA_NOT_CTLDEV, periph->unit_number, i, SA_ATYPE_ER),
1487	UID_ROOT, GID_OPERATOR, 0660, "er%s%d.%d",	1487	UID_ROOT, GID_OPERATOR, 0660, "e%s%d.%d",
1488	periph->periph_name, periph->unit_number, i);	1488	periph->periph_name, periph->unit_number, i);
1489		1489
1490	/*	1490	/*
Lines 1492-1502 Link Here
1492	*/	1492	*/
1493	if (i == 0) {	1493	if (i == 0) {
1494	make_dev_alias(softc->devs.mode_devs[i].r_dev,	1494	make_dev_alias(softc->devs.mode_devs[i].r_dev,
1495	"r%s%d", periph->periph_name, periph->unit_number);	1495	"%s%d", periph->periph_name, periph->unit_number);
1496	make_dev_alias(softc->devs.mode_devs[i].nr_dev,	1496	make_dev_alias(softc->devs.mode_devs[i].nr_dev,
1497	"nr%s%d", periph->periph_name, periph->unit_number);	1497	"n%s%d", periph->periph_name, periph->unit_number);
1498	make_dev_alias(softc->devs.mode_devs[i].er_dev,	1498	make_dev_alias(softc->devs.mode_devs[i].er_dev,
1499	"er%s%d", periph->periph_name, periph->unit_number);	1499	"e%s%d", periph->periph_name, periph->unit_number);
1500	}	1500	}
1501	}	1501	}