29c29
< __FBSDID("$FreeBSD: head/sys/dev/ppbus/vpo.c 184130 2008-10-21 18:30:10Z jhb $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ppbus/vpo.c 185003 2008-11-16 17:42:02Z jhb $");
181c181,182
< free(ccb, M_TEMP);
---
>
> free(ccb, M_TEMP);
187,188c188,189
< struct cam_path *path;
< union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO);
---
> struct cam_path *path;
> union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO);
190,191c191,192
< if (xpt_create_path(&path, xpt_periph, cam_sim_path(vpo->sim), 0, 0)
< != CAM_REQ_CMP) {
---
> if (xpt_create_path(&path, xpt_periph, cam_sim_path(vpo->sim), 0, 0)
> != CAM_REQ_CMP) {
194c195
< return;
---
> return;
197,201c198,202
< xpt_setup_ccb(&ccb->ccb_h, path, 5/*priority (low)*/);
< ccb->ccb_h.func_code = XPT_SCAN_BUS;
< ccb->ccb_h.cbfcnp = vpo_cam_rescan_callback;
< ccb->crcn.flags = CAM_FLAG_NONE;
< xpt_action(ccb);
---
> xpt_setup_ccb(&ccb->ccb_h, path, 5/*priority (low)*/);
> ccb->ccb_h.func_code = XPT_SCAN_BUS;
> ccb->ccb_h.cbfcnp = vpo_cam_rescan_callback;
> ccb->crcn.flags = CAM_FLAG_NONE;
> xpt_action(ccb);
203c204
< /* The scan is in progress now. */
---
> /* The scan is in progress now. */
235c236
< printf("vpo_do_scsi = %d, status = 0x%x, count = %d, vpo_error = %d\n",
---
> printf("vpo_do_scsi = %d, status = 0x%x, count = %d, vpo_error = %d\n",
289d289
<
290a291
>
292c293
< printf("(sense) vpo_do_scsi = %d, status = 0x%x, count = %d, vpo_error = %d\n",
---
> printf("(sense) vpo_do_scsi = %d, status = 0x%x, count = %d, vpo_error = %d\n",
316c317
< csio->ccb_h.status = CAM_SCSI_STATUS_ERROR;
---
> csio->ccb_h.status = CAM_SCSI_STATUS_ERROR;
348c349
<
---
>
407c408
<
---
>
441,443c442,444
< {
< /* The ZIP is actually always polled throw vpo_action() */
< return;
---
> {
>
> /* The ZIP is actually always polled throw vpo_action(). */