system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 21:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change the "Duplicate Wired Device entry" printout in camperiphnextunit to

Browse source 
also mention the peripheral name, bus, target and lun of the device we
attempted to put in that slot.  This gives the user a little more
information about what is going on.

Tested by:	Andre Albsmeier <andre.albsmeier@mchp.siemens.de>
Discussed with:	gibbs
This commit is contained in:
Kenneth D. Merry 2000-08-29 22:11:39 +00:00
parent b0f62f0c1c
commit 501468a517
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=65225
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sys/cam/cam_periph.c
View file

@ -2,7 +2,7 @@
* Common functions for CAM "type" (peripheral) drivers.
*
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
* Copyright (c) 1997, 1998, 1999, 2000 Kenneth D. Merry.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -54,10 +54,12 @@
#include <cam/scsi/scsi_pass.h>
static u_int camperiphnextunit(struct periph_driver *p_drv,
u_int newunit, int wired);
u_int newunit, int wired,
path_id_t pathid, target_id_t target,
lun_id_t lun);
static u_int camperiphunit(struct periph_driver *p_drv,
path_id_t path_id_t,
target_id_t target, lun_id_t lun);
path_id_t pathid, target_id_t target,
lun_id_t lun);
static void camperiphdone(struct cam_periph *periph,
union ccb *done_ccb);
static void camperiphfree(struct cam_periph *periph);
@ -262,7 +264,8 @@ cam_periph_release(struct cam_periph *periph)
* numbers that did not match a wiring entry.
*/
static u_int
camperiphnextunit(struct periph_driver *p_drv, u_int newunit, int wired)
camperiphnextunit(struct periph_driver *p_drv, u_int newunit, int wired,
path_id_t pathid, target_id_t target, lun_id_t lun)
{
struct cam_periph *periph;
char *periph_name, *strval;
@ -284,7 +287,9 @@ camperiphnextunit(struct periph_driver *p_drv, u_int newunit, int wired)
xpt_print_path(periph->path);
printf("Duplicate Wired Device entry!\n");
xpt_print_path(periph->path);
printf("Second device will not be wired\n");
printf("Second device (%s device at scbus%d "
"target %d lun %d) will not be wired\n",
periph_name, pathid, target, lun);
wired = 0;
}
continue;
@ -361,7 +366,8 @@ camperiphunit(struct periph_driver *p_drv, path_id_t pathid,
* if we have wildcard matches, we don't return the same
* unit number twice.
*/
unit = camperiphnextunit(p_drv, unit, /*wired*/hit);
unit = camperiphnextunit(p_drv, unit, /*wired*/hit, pathid,
target, lun);
return (unit);
}