PERFORCE change 166552 for review
Alexander Motin
mav at FreeBSD.org
Sat Jul 25 12:19:36 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=166552
Change 166552 by mav at mav_mavbook on 2009/07/25 12:19:00
Define and use formal constants instead of raw numeric values for
priority levels.
Affected files ...
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#20 edit
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#2 edit
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#29 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam.h#7 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#33 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#94 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#10 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#26 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#18 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#43 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#16 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#14 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#20 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#15 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#12 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#17 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#15 edit
Differences ...
==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#20 (text+ko) ====
@@ -274,7 +274,7 @@
/* We only sync the cache if the drive is capable of it. */
if (softc->flags & ADA_FLAG_CAN_FLUSHCACHE) {
- ccb = cam_periph_getccb(periph, /*priority*/1);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
cam_fill_ataio(&ccb->ataio,
1,
adadone,
@@ -361,7 +361,7 @@
/*
* Schedule ourselves for performing the work.
*/
- xpt_schedule(periph, /* XXX priority */1);
+ xpt_schedule(periph, CAM_PRIORITY_NORMAL);
cam_periph_unlock(periph);
return;
@@ -395,7 +395,7 @@
if (length > 0) {
periph->flags |= CAM_PERIPH_POLLED;
- xpt_setup_ccb(&ccb.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
ccb.ccb_h.ccb_state = ADA_CCB_DUMP;
cam_fill_ataio(&ccb.ataio,
0,
@@ -426,7 +426,7 @@
}
if (softc->flags & ADA_FLAG_CAN_FLUSHCACHE) {
- xpt_setup_ccb(&ccb.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
ccb.ccb_h.ccb_state = ADA_CCB_DUMP;
cam_fill_ataio(&ccb.ataio,
@@ -687,7 +687,7 @@
/* Check if the SIM does not want queued commands */
bzero(&cpi, sizeof(cpi));
- xpt_setup_ccb(&cpi.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&cpi.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
cpi.ccb_h.func_code = XPT_PATH_INQ;
xpt_action((union ccb *)&cpi);
if (cpi.ccb_h.status != CAM_REQ_CMP ||
@@ -765,7 +765,7 @@
* the end of probe.
*/
// (void)cam_periph_hold(periph, PRIBIO);
-// xpt_schedule(periph, /*priority*/5);
+// xpt_schedule(periph, CAM_PRIORITY_DEV);
/*
* Schedule a periodic event to occasionally send an
@@ -905,7 +905,7 @@
if (bp != NULL) {
/* Have more work to do, so ensure we stay scheduled */
- xpt_schedule(periph, /* XXX priority */1);
+ xpt_schedule(periph, CAM_PRIORITY_NORMAL);
}
break;
}
@@ -1111,7 +1111,7 @@
continue;
}
- xpt_setup_ccb(&ccb.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
ccb.ccb_h.ccb_state = ADA_CCB_DUMP;
cam_fill_ataio(&ccb.ataio,
==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#2 (text+ko) ====
@@ -273,7 +273,7 @@
case AC_SCSI_AEN:
softc = (struct pmp_softc *)periph->softc;
softc->state = PMP_STATE_PORTS;
- xpt_schedule(periph, /*priority*/5);
+ xpt_schedule(periph, CAM_PRIORITY_BUS);
break;
default:
cam_periph_async(periph, code, path, arg);
@@ -360,7 +360,7 @@
/* Check if the SIM does not want queued commands */
bzero(&cpi, sizeof(cpi));
- xpt_setup_ccb(&cpi.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&cpi.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
cpi.ccb_h.func_code = XPT_PATH_INQ;
xpt_action((union ccb *)&cpi);
@@ -387,7 +387,7 @@
* the end of probe.
*/
// (void)cam_periph_hold(periph, PRIBIO);
- xpt_schedule(periph, /*priority*/5);
+ xpt_schedule(periph, CAM_PRIORITY_BUS);
return(CAM_REQ_CMP);
}
==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#29 (text+ko) ====
@@ -258,7 +258,7 @@
softc = (probe_softc *)periph->softc;
ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs);
- xpt_setup_ccb(&cpi.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&cpi.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
cpi.ccb_h.func_code = XPT_PATH_INQ;
xpt_action((union ccb *)&cpi);
@@ -297,7 +297,8 @@
if (start_ccb->ccb_h.target_id == 15) {
/* Report SIM that we have no knowledge about PM presence. */
bzero(&cts, sizeof(cts));
- xpt_setup_ccb(&cts.ccb_h, start_ccb->ccb_h.path, 1);
+ xpt_setup_ccb(&cts.ccb_h, start_ccb->ccb_h.path,
+ CAM_PRIORITY_NORMAL);
cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
cts.type = CTS_TYPE_CURRENT_SETTINGS;
cts.xport_specific.sata.pm_present = 0;
@@ -432,7 +433,7 @@
{
struct ccb_trans_settings cts;
- xpt_setup_ccb(&cts.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&cts.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
cts.type = CTS_TYPE_USER_SETTINGS;
xpt_action((union ccb *)&cts);
@@ -454,7 +455,7 @@
struct ccb_trans_settings_spi *spi;
memset(&cts, 0, sizeof (cts));
- xpt_setup_ccb(&cts.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&cts.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
cts.type = CTS_TYPE_CURRENT_SETTINGS;
xpt_action((union ccb *)&cts);
@@ -581,7 +582,7 @@
/* Report SIM that PM is present. */
bzero(&cts, sizeof(cts));
- xpt_setup_ccb(&cts.ccb_h, path, 1);
+ xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL);
cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
cts.type = CTS_TYPE_CURRENT_SETTINGS;
cts.xport_specific.sata.pm_present = 1;
@@ -1054,7 +1055,7 @@
CAM_DEBUG(request_ccb->ccb_h.path, CAM_DEBUG_TRACE,
("xpt_scan_lun\n"));
- xpt_setup_ccb(&cpi.ccb_h, path, /*priority*/1);
+ xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NORMAL);
cpi.ccb_h.func_code = XPT_PATH_INQ;
xpt_action((union ccb *)&cpi);
@@ -1092,7 +1093,7 @@
free(new_path, M_CAMXPT);
return;
}
- xpt_setup_ccb(&request_ccb->ccb_h, new_path, /*priority*/ 1);
+ xpt_setup_ccb(&request_ccb->ccb_h, new_path, CAM_PRIORITY_NORMAL);
request_ccb->ccb_h.cbfcnp = xptscandone;
request_ccb->ccb_h.func_code = XPT_SCAN_LUN;
request_ccb->crcn.flags = flags;
@@ -1190,7 +1191,7 @@
struct scsi_inquiry_data *inq_buf;
/* Get transport information from the SIM */
- xpt_setup_ccb(&cpi.ccb_h, path, /*priority*/1);
+ xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NORMAL);
cpi.ccb_h.func_code = XPT_PATH_INQ;
xpt_action((union ccb *)&cpi);
@@ -1250,7 +1251,7 @@
*/
/* Tell the controller what we think */
- xpt_setup_ccb(&cts.ccb_h, path, /*priority*/1);
+ xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL);
cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
cts.type = CTS_TYPE_CURRENT_SETTINGS;
cts.transport = path->device->transport;
@@ -1379,7 +1380,7 @@
inq_data = &device->inq_data;
scsi = &cts->proto_specific.scsi;
- xpt_setup_ccb(&cpi.ccb_h, cts->ccb_h.path, /*priority*/1);
+ xpt_setup_ccb(&cpi.ccb_h, cts->ccb_h.path, CAM_PRIORITY_NORMAL);
cpi.ccb_h.func_code = XPT_PATH_INQ;
xpt_action((union ccb *)&cpi);
@@ -1400,7 +1401,7 @@
* Perform sanity checking against what the
* controller and device can do.
*/
- xpt_setup_ccb(&cur_cts.ccb_h, cts->ccb_h.path, /*priority*/1);
+ xpt_setup_ccb(&cur_cts.ccb_h, cts->ccb_h.path, CAM_PRIORITY_NORMAL);
cur_cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
cur_cts.type = cts->type;
xpt_action((union ccb *)&cur_cts);
@@ -1568,7 +1569,7 @@
device->tag_delay_count = 0;
xpt_setup_ccb(&crs.ccb_h, cts->ccb_h.path,
- /*priority*/1);
+ CAM_PRIORITY_NORMAL);
crs.ccb_h.func_code = XPT_REL_SIMQ;
crs.release_flags = RELSIM_RELEASE_AFTER_QEMPTY;
crs.openings
@@ -1601,7 +1602,7 @@
&& (dev->inq_flags & (SID_Sync|SID_WBus16|SID_WBus32)) != 0)) {
struct ccb_trans_settings cts;
- xpt_setup_ccb(&cts.ccb_h, path, 1);
+ xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL);
cts.protocol = PROTO_SCSI;
cts.protocol_version = PROTO_VERSION_UNSPECIFIED;
cts.transport = XPORT_UNSPECIFIED;
==== //depot/projects/scottl-camlock/src/sys/cam/cam.h#7 (text+ko) ====
@@ -66,6 +66,11 @@
*/
typedef struct {
u_int32_t priority;
+#define CAM_PRIORITY_HOST 100
+#define CAM_PRIORITY_BUS 200
+#define CAM_PRIORITY_DEV 300
+#define CAM_PRIORITY_HIGH 400
+#define CAM_PRIORITY_NORMAL 500
#define CAM_PRIORITY_NONE (u_int32_t)-1
u_int32_t generation;
int index;
==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#33 (text+ko) ====
@@ -534,13 +534,13 @@
switch (periph->deferred_ac) {
case AC_FOUND_DEVICE:
ccb.ccb_h.func_code = XPT_GDEV_TYPE;
- xpt_setup_ccb(&ccb.ccb_h, periph->path, /*priority*/ 1);
+ xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
xpt_action(&ccb);
arg = &ccb;
break;
case AC_PATH_REGISTERED:
ccb.ccb_h.func_code = XPT_PATH_INQ;
- xpt_setup_ccb(&ccb.ccb_h, periph->path, /*priority*/ 1);
+ xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
xpt_action(&ccb);
arg = &ccb;
break;
@@ -831,10 +831,10 @@
switch(cmd){
case CAMGETPASSTHRU:
- ccb = cam_periph_getccb(periph, /* priority */ 1);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
xpt_setup_ccb(&ccb->ccb_h,
ccb->ccb_h.path,
- /*priority*/1);
+ CAM_PRIORITY_NORMAL);
ccb->ccb_h.func_code = XPT_GDEVLIST;
/*
@@ -939,7 +939,7 @@
{
struct ccb_hdr ccb_h;
- xpt_setup_ccb(&ccb_h, path, /*priority*/1);
+ xpt_setup_ccb(&ccb_h, path, CAM_PRIORITY_NORMAL);
ccb_h.func_code = XPT_NOOP;
ccb_h.flags = CAM_DEV_QFREEZE;
xpt_action((union ccb *)&ccb_h);
@@ -952,8 +952,7 @@
{
struct ccb_relsim crs;
- xpt_setup_ccb(&crs.ccb_h, path,
- /*priority*/1);
+ xpt_setup_ccb(&crs.ccb_h, path, CAM_PRIORITY_NORMAL);
crs.ccb_h.func_code = XPT_REL_SIMQ;
crs.ccb_h.flags = getcount_only ? CAM_DEV_QFREEZE : 0;
crs.release_flags = relsim_flags;
@@ -1065,7 +1064,7 @@
* Grab the inquiry data for this device.
*/
xpt_setup_ccb(&cgd.ccb_h, done_ccb->ccb_h.path,
- /*priority*/ 1);
+ CAM_PRIORITY_NORMAL);
cgd.ccb_h.func_code = XPT_GDEV_TYPE;
xpt_action((union ccb *)&cgd);
err_action = scsi_error_action(&done_ccb->csio,
@@ -1207,7 +1206,7 @@
{
struct ccb_getdevstats cgds;
- xpt_setup_ccb(&cgds.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&cgds.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
cgds.ccb_h.func_code = XPT_GDEV_STATS;
xpt_action((union ccb *)&cgds);
cam_periph_freeze_after_event(periph, &cgds.last_reset, bus_settle);
@@ -1275,7 +1274,7 @@
*/
xpt_setup_ccb(&cgds.ccb_h,
ccb->ccb_h.path,
- /*priority*/1);
+ CAM_PRIORITY_NORMAL);
cgds.ccb_h.func_code = XPT_GDEV_STATS;
xpt_action((union ccb *)&cgds);
@@ -1398,7 +1397,7 @@
/*
* Grab the inquiry data for this device.
*/
- xpt_setup_ccb(&cgd.ccb_h, ccb->ccb_h.path, /*priority*/ 1);
+ xpt_setup_ccb(&cgd.ccb_h, ccb->ccb_h.path, CAM_PRIORITY_NORMAL);
cgd.ccb_h.func_code = XPT_GDEV_TYPE;
xpt_action((union ccb *)&cgd);
@@ -1538,14 +1537,14 @@
if ((err_action & SS_MASK) >= SS_START) {
/*
- * Drop the priority to 0 so that the recovery
+ * Drop the priority, so that the recovery
* CCB is the first to execute. Freeze the queue
* after this command is sent so that we can
* restore the old csio and have it queued in
* the proper order before we release normal
* transactions to the device.
*/
- ccb->ccb_h.pinfo.priority = 0;
+ ccb->ccb_h.pinfo.priority = CAM_PRIORITY_DEV;
ccb->ccb_h.flags |= CAM_DEV_QFREEZE;
ccb->ccb_h.saved_ccb_ptr = save_ccb;
error = ERESTART;
==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#94 (text+ko) ====
@@ -808,7 +808,7 @@
ccb->ccb_h.func_code = XPT_SCAN_BUS;
ccb->ccb_h.cbfcnp = xptdone;
- xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path, 5);
+ xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path, CAM_PRIORITY_BUS);
cam_periph_runccb(ccb, NULL, 0, 0, NULL);
xpt_free_path(ccb->ccb_h.path);
xpt_free_ccb(ccb);
@@ -1053,7 +1053,7 @@
printf("%s%d: Serial Number %.60s\n", periph->periph_name,
periph->unit_number, path->device->serial_num);
}
- xpt_setup_ccb(&cts.ccb_h, path, /*priority*/1);
+ xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL);
cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
cts.type = CTS_TYPE_CURRENT_SETTINGS;
xpt_action((union ccb*)&cts);
@@ -1062,7 +1062,7 @@
}
/* Ask the SIM for its base transfer speed */
- xpt_setup_ccb(&cpi.ccb_h, path, /*priority*/1);
+ xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NORMAL);
cpi.ccb_h.func_code = XPT_PATH_INQ;
xpt_action((union ccb *)&cpi);
@@ -2329,7 +2329,7 @@
device->target->bus->path_id,
device->target->target_id,
device->lun_id);
- xpt_setup_ccb(&cgd.ccb_h, &path, /*priority*/1);
+ xpt_setup_ccb(&cgd.ccb_h, &path, CAM_PRIORITY_NORMAL);
cgd.ccb_h.func_code = XPT_GDEV_TYPE;
xpt_action((union ccb *)&cgd);
cur_entry->callback(cur_entry->callback_arg,
@@ -2353,7 +2353,7 @@
bus->sim->path_id,
CAM_TARGET_WILDCARD,
CAM_LUN_WILDCARD);
- xpt_setup_ccb(&cpi.ccb_h, &path, /*priority*/1);
+ xpt_setup_ccb(&cpi.ccb_h, &path, CAM_PRIORITY_NORMAL);
cpi.ccb_h.func_code = XPT_PATH_INQ;
xpt_action((union ccb *)&cpi);
cur_entry->callback(cur_entry->callback_arg,
@@ -3789,7 +3789,7 @@
if (status != CAM_REQ_CMP)
printf("xpt_compile_path returned %d\n", status);
- xpt_setup_ccb(&cpi.ccb_h, &path, /*priority*/1);
+ xpt_setup_ccb(&cpi.ccb_h, &path, CAM_PRIORITY_NORMAL);
cpi.ccb_h.func_code = XPT_PATH_INQ;
xpt_action((union ccb *)&cpi);
@@ -4535,7 +4535,7 @@
newopenings = min(device->maxtags,
sim->max_tagged_dev_openings);
xpt_dev_ccbq_resize(path, newopenings);
- xpt_setup_ccb(&crs.ccb_h, path, /*priority*/1);
+ xpt_setup_ccb(&crs.ccb_h, path, CAM_PRIORITY_NORMAL);
crs.ccb_h.func_code = XPT_REL_SIMQ;
crs.release_flags = RELSIM_RELEASE_AFTER_QEMPTY;
crs.openings
@@ -4562,7 +4562,7 @@
busses_to_config++;
xpt_compile_path(&path, NULL, bus->path_id,
CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD);
- xpt_setup_ccb(&cpi.ccb_h, &path, /*priority*/1);
+ xpt_setup_ccb(&cpi.ccb_h, &path, CAM_PRIORITY_NORMAL);
cpi.ccb_h.func_code = XPT_PATH_INQ;
xpt_action((union ccb *)&cpi);
can_negotiate = cpi.hba_inquiry;
@@ -4605,7 +4605,7 @@
xpt_finishconfig(xpt_periph, NULL);
return(0);
}
- xpt_setup_ccb(&work_ccb->ccb_h, path, /*priority*/1);
+ xpt_setup_ccb(&work_ccb->ccb_h, path, CAM_PRIORITY_NORMAL);
work_ccb->ccb_h.func_code = XPT_PATH_INQ;
xpt_action(work_ccb);
if (work_ccb->ccb_h.status != CAM_REQ_CMP) {
@@ -4620,7 +4620,7 @@
can_negotiate &= (PI_WIDE_32|PI_WIDE_16|PI_SDTR_ABLE);
if ((work_ccb->cpi.hba_misc & PIM_NOBUSRESET) == 0
&& (can_negotiate != 0)) {
- xpt_setup_ccb(&work_ccb->ccb_h, path, /*priority*/1);
+ xpt_setup_ccb(&work_ccb->ccb_h, path, CAM_PRIORITY_NORMAL);
work_ccb->ccb_h.func_code = XPT_RESET_BUS;
work_ccb->ccb_h.cbfcnp = NULL;
CAM_DEBUG(path, CAM_DEBUG_SUBTRACE,
@@ -4799,7 +4799,7 @@
xptpath = 1;
}
- xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5);
+ xpt_setup_ccb(&csa.ccb_h, path, CAM_PRIORITY_NORMAL);
csa.ccb_h.func_code = XPT_SASYNC_CB;
csa.event_enable = event;
csa.callback = cbfunc;
==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#10 (text+ko) ====
@@ -3004,7 +3004,7 @@
*/
xpt_setup_ccb(&cgd.ccb_h,
csio->ccb_h.path,
- /*priority*/ 1);
+ CAM_PRIORITY_NORMAL);
cgd.ccb_h.func_code = XPT_GDEV_TYPE;
xpt_action((union ccb *)&cgd);
@@ -3088,7 +3088,7 @@
*/
xpt_setup_ccb(&cgd.ccb_h,
csio->ccb_h.path,
- /*priority*/ 1);
+ CAM_PRIORITY_NORMAL);
cgd.ccb_h.func_code = XPT_GDEV_TYPE;
xpt_action((union ccb *)&cgd);
==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#26 (text+ko) ====
@@ -673,7 +673,7 @@
softc->quirks = CD_Q_NONE;
/* Check if the SIM does not want 6 byte commands */
- xpt_setup_ccb(&cpi.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&cpi.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
cpi.ccb_h.func_code = XPT_PATH_INQ;
xpt_action((union ccb *)&cpi);
if (cpi.ccb_h.status == CAM_REQ_CMP && (cpi.hba_misc & PIM_NO_6_BYTE))
@@ -965,9 +965,9 @@
(void)cam_periph_hold(periph, PRIBIO);
if ((softc->flags & CD_FLAG_CHANGER) == 0)
- xpt_schedule(periph, /*priority*/5);
+ xpt_schedule(periph, CAM_PRIORITY_DEV);
else
- cdschedule(periph, /*priority*/ 5);
+ cdschedule(periph, CAM_PRIORITY_DEV);
return(CAM_REQ_CMP);
}
@@ -1105,7 +1105,7 @@
* We don't do anything with the priority here.
* This is strictly a fifo queue.
*/
- softc->pinfo.priority = 1;
+ softc->pinfo.priority = CAM_PRIORITY_NORMAL;
softc->pinfo.generation = ++softc->changer->devq.generation;
camq_insert(&softc->changer->devq, (cam_pinfo *)softc);
@@ -1206,7 +1206,7 @@
/* Just in case this device is waiting */
wakeup(&softc->changer);
- xpt_schedule(softc->periph, /*priority*/ 1);
+ xpt_schedule(softc->periph, CAM_PRIORITY_NORMAL);
/*
* Get rid of any pending timeouts, and set a flag to schedule new
@@ -1344,7 +1344,7 @@
* If this changer isn't already queued, queue it up.
*/
if (softc->pinfo.index == CAM_UNQUEUED_INDEX) {
- softc->pinfo.priority = 1;
+ softc->pinfo.priority = CAM_PRIORITY_NORMAL;
softc->pinfo.generation =
++softc->changer->devq.generation;
camq_insert(&softc->changer->devq,
@@ -1421,9 +1421,9 @@
* differently for changers.
*/
if ((softc->flags & CD_FLAG_CHANGER) == 0)
- xpt_schedule(periph, /* XXX priority */1);
+ xpt_schedule(periph, CAM_PRIORITY_NORMAL);
else
- cdschedule(periph, /* priority */ 1);
+ cdschedule(periph, CAM_PRIORITY_NORMAL);
cam_periph_unlock(periph);
return;
@@ -1493,7 +1493,7 @@
}
if (bp != NULL) {
/* Have more work to do, so ensure we stay scheduled */
- xpt_schedule(periph, /* XXX priority */1);
+ xpt_schedule(periph, CAM_PRIORITY_NORMAL);
}
break;
}
@@ -1668,7 +1668,7 @@
xpt_setup_ccb(&cgd.ccb_h,
done_ccb->ccb_h.path,
- /* priority */ 1);
+ CAM_PRIORITY_NORMAL);
cgd.ccb_h.func_code = XPT_GDEV_TYPE;
xpt_action((union ccb *)&cgd);
@@ -2727,7 +2727,7 @@
return;
}
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
scsi_prevent(&ccb->csio,
/*retries*/ 1,
@@ -2901,7 +2901,7 @@
softc = (struct cd_softc *)periph->softc;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
/* XXX Should be M_WAITOK */
rcap_buf = malloc(sizeof(struct scsi_read_capacity_data),
@@ -3153,7 +3153,7 @@
ntoc = len;
error = 0;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
csio = &ccb->csio;
@@ -3200,7 +3200,7 @@
error = 0;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
csio = &ccb->csio;
@@ -3252,7 +3252,7 @@
softc = (struct cd_softc *)periph->softc;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
csio = &ccb->csio;
@@ -3351,7 +3351,7 @@
softc = (struct cd_softc *)periph->softc;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
csio = &ccb->csio;
@@ -3443,7 +3443,7 @@
u_int8_t cdb_len;
error = 0;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
csio = &ccb->csio;
/*
* Use the smallest possible command to perform the operation.
@@ -3500,7 +3500,7 @@
error = 0;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
csio = &ccb->csio;
@@ -3546,7 +3546,7 @@
error = 0;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
csio = &ccb->csio;
@@ -3588,7 +3588,7 @@
error = 0;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
csio = &ccb->csio;
@@ -3625,7 +3625,7 @@
error = 0;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
scsi_start_stop(&ccb->csio,
/* retries */ 1,
@@ -3653,7 +3653,7 @@
error = 0;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
scsi_start_stop(&ccb->csio,
/* retries */ 1,
@@ -3682,7 +3682,7 @@
int error;
error = 0;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
csio = &ccb->csio;
/* Preserve old behavior: units in multiples of CDROM speed */
@@ -3730,7 +3730,7 @@
databuf = NULL;
lba = 0;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
switch (authinfo->format) {
case DVD_REPORT_AGID:
@@ -3887,7 +3887,7 @@
error = 0;
databuf = NULL;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
switch(authinfo->format) {
case DVD_SEND_CHALLENGE: {
@@ -3983,7 +3983,7 @@
/* The address is reserved for many of the formats */
address = 0;
- ccb = cdgetccb(periph, /* priority */ 1);
+ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL);
switch(dvdstruct->format) {
case DVD_STRUCT_PHYSICAL:
==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#18 (text+ko) ====
@@ -376,7 +376,7 @@
* This first call can't block
*/
(void)cam_periph_hold(periph, PRIBIO);
- xpt_schedule(periph, /*priority*/5);
+ xpt_schedule(periph, CAM_PRIORITY_DEV);
return(CAM_REQ_CMP);
}
@@ -809,7 +809,7 @@
fromelem = softc->sc_firsts[cm->cm_fromtype] + cm->cm_fromunit;
toelem = softc->sc_firsts[cm->cm_totype] + cm->cm_tounit;
- ccb = cam_periph_getccb(periph, /*priority*/ 1);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
scsi_move_medium(&ccb->csio,
/* retries */ 1,
@@ -868,7 +868,7 @@
dst1 = softc->sc_firsts[ce->ce_fdsttype] + ce->ce_fdstunit;
dst2 = softc->sc_firsts[ce->ce_sdsttype] + ce->ce_sdstunit;
- ccb = cam_periph_getccb(periph, /*priority*/ 1);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
scsi_exchange_medium(&ccb->csio,
/* retries */ 1,
@@ -918,7 +918,7 @@
*/
dst = softc->sc_firsts[cp->cp_type] + cp->cp_unit;
- ccb = cam_periph_getccb(periph, /*priority*/ 1);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
scsi_position_to_element(&ccb->csio,
/* retries */ 1,
@@ -1075,7 +1075,7 @@
data = (caddr_t)malloc(1024, M_DEVBUF, M_WAITOK);
cam_periph_lock(periph);
- ccb = cam_periph_getccb(periph, /*priority*/ 1);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
scsi_read_element_status(&ccb->csio,
/* retries */ 1,
@@ -1201,7 +1201,7 @@
error = 0;
softc = (struct ch_softc *)periph->softc;
- ccb = cam_periph_getccb(periph, /*priority*/ 1);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
scsi_initialize_element_status(&ccb->csio,
/* retries */ 1,
@@ -1285,7 +1285,7 @@
min(strlen(csvr->csvr_voltag.cv_volid), sizeof(ssvtp.vitf)));
scsi_ulto2b(csvr->csvr_voltag.cv_serial, ssvtp.minvsn);
- ccb = cam_periph_getccb(periph, /*priority*/ 1);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
scsi_send_volume_tag(&ccb->csio,
/* retries */ 1,
@@ -1323,7 +1323,7 @@
softc = (struct ch_softc *)periph->softc;
- ccb = cam_periph_getccb(periph, /*priority*/ 1);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
/*
* The scsi_mode_sense_data structure is just a convenience
==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#43 (text+ko) ====
@@ -721,7 +721,7 @@
if ((softc->quirks & DA_Q_NO_SYNC_CACHE) == 0) {
union ccb *ccb;
- ccb = cam_periph_getccb(periph, /*priority*/1);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
scsi_synchronize_cache(&ccb->csio,
/*retries*/1,
@@ -835,7 +835,7 @@
/*
* Schedule ourselves for performing the work.
*/
- xpt_schedule(periph, /* XXX priority */1);
+ xpt_schedule(periph, CAM_PRIORITY_NORMAL);
cam_periph_unlock(periph);
return;
@@ -865,7 +865,7 @@
if (length > 0) {
periph->flags |= CAM_PERIPH_POLLED;
- xpt_setup_ccb(&csio.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&csio.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
csio.ccb_h.ccb_state = DA_CCB_DUMP;
scsi_read_write(&csio,
/*retries*/1,
@@ -902,7 +902,7 @@
*/
if ((softc->quirks & DA_Q_NO_SYNC_CACHE) == 0) {
- xpt_setup_ccb(&csio.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&csio.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
csio.ccb_h.ccb_state = DA_CCB_DUMP;
scsi_synchronize_cache(&csio,
/*retries*/1,
@@ -1199,7 +1199,7 @@
/* Check if the SIM does not want 6 byte commands */
bzero(&cpi, sizeof(cpi));
- xpt_setup_ccb(&cpi.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&cpi.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
cpi.ccb_h.func_code = XPT_PATH_INQ;
xpt_action((union ccb *)&cpi);
if (cpi.ccb_h.status == CAM_REQ_CMP && (cpi.hba_misc & PIM_NO_6_BYTE))
@@ -1278,7 +1278,7 @@
* the end of probe.
*/
(void)cam_periph_hold(periph, PRIBIO);
- xpt_schedule(periph, /*priority*/5);
+ xpt_schedule(periph, CAM_PRIORITY_DEV);
/*
* Schedule a periodic event to occasionally send an
@@ -1384,7 +1384,7 @@
if (bp != NULL) {
/* Have more work to do, so ensure we stay scheduled */
- xpt_schedule(periph, /* XXX priority */1);
+ xpt_schedule(periph, CAM_PRIORITY_NORMAL);
}
break;
}
@@ -1494,8 +1494,10 @@
{
struct da_softc *softc;
struct ccb_scsiio *csio;
+ u_int32_t priority;
softc = (struct da_softc *)periph->softc;
+ priority = done_ccb->ccb_h.pinfo.priority;
csio = &done_ccb->csio;
switch (csio->ccb_h.ccb_state & DA_CCB_TYPE_MASK) {
case DA_CCB_BUFFER_IO:
@@ -1613,7 +1615,7 @@
softc->state = DA_STATE_PROBE2;
free(rdcap, M_SCSIDA);
xpt_release_ccb(done_ccb);
- xpt_schedule(periph, /*priority*/5);
+ xpt_schedule(periph, priority);
return;
}
} else {
@@ -1681,7 +1683,7 @@
xpt_setup_ccb(&cgd.ccb_h,
done_ccb->ccb_h.path,
- /* priority */ 1);
+ priority);
cgd.ccb_h.func_code = XPT_GDEV_TYPE;
xpt_action((union ccb *)&cgd);
@@ -1835,7 +1837,7 @@
return;
}
- ccb = cam_periph_getccb(periph, /*priority*/1);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
scsi_prevent(&ccb->csio,
/*retries*/1,
@@ -1885,7 +1887,7 @@
if (rcap == NULL)
return (ENOMEM);
- ccb = cam_periph_getccb(periph, /*priority*/1);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
scsi_read_capacity(&ccb->csio,
/*retries*/4,
/*cbfncp*/dadone,
@@ -1979,7 +1981,7 @@
* up with something that will make this a bootable
* device.
*/
- xpt_setup_ccb(&ccg.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&ccg.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
ccg.ccb_h.func_code = XPT_CALC_GEOMETRY;
ccg.block_size = dp->secsize;
ccg.volume_size = dp->sectors;
@@ -2053,7 +2055,7 @@
continue;
}
- xpt_setup_ccb(&ccb.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
ccb.ccb_h.ccb_state = DA_CCB_DUMP;
scsi_synchronize_cache(&ccb.csio,
==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#16 (text+ko) ====
@@ -976,7 +976,7 @@
ccb = xpt_alloc_ccb();
bzero(ccb, sizeof(union ccb));
- xpt_setup_ccb(&ccb->ccb_h, path, 5);
+ xpt_setup_ccb(&ccb->ccb_h, path, CAM_PRIORITY_BUS);
ccb->ccb_h.func_code = XPT_SCAN_BUS;
ccb->ccb_h.cbfcnp = scsi_low_cam_rescan_callback;
ccb->crcn.flags = CAM_FLAG_NONE;
==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#14 (text+ko) ====
@@ -224,7 +224,7 @@
/*
* Schedule ourselves for performing the work.
*/
- xpt_schedule(periph, /* XXX priority */1);
+ xpt_schedule(periph, CAM_PRIORITY_NORMAL);
cam_periph_unlock(periph);
return;
@@ -464,7 +464,7 @@
if (bp != NULL) {
/* Have more work to do, so ensure we stay scheduled */
- xpt_schedule(periph, /* XXX priority */1);
+ xpt_schedule(periph, CAM_PRIORITY_NORMAL);
}
}
}
==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#20 (text+ko) ====
@@ -786,7 +786,7 @@
/*
* Schedule ourselves for performing the work.
*/
- xpt_schedule(periph, 1);
+ xpt_schedule(periph, CAM_PRIORITY_NORMAL);
cam_periph_unlock(periph);
return;
@@ -1689,7 +1689,7 @@
if (bp != NULL) {
/* Have more work to do, so ensure we stay scheduled */
- xpt_schedule(periph, 1);
+ xpt_schedule(periph, CAM_PRIORITY_NORMAL);
}
break;
}
==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#15 (text+ko) ====
@@ -510,7 +510,7 @@
break;
}
- ccb = cam_periph_getccb(periph, /*priority*/5);
+ ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
csio = &ccb->csio;
error = copyin(req.cmdp, &csio->cdb_io.cdb_bytes,
@@ -729,7 +729,7 @@
cam_periph_lock(periph);
sc = periph->softc;
- xpt_setup_ccb(&ccb->ccb_h, periph->path, /*priority*/5);
+ xpt_setup_ccb(&ccb->ccb_h, periph->path, CAM_PRIORITY_NORMAL);
cam_fill_csio(csio,
/*retries*/1,
sgdone,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list