d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an implicit dependency between the MFI driver and CAM that had grown due

Browse Source 
to an API change in CAM.  It's once again possible to link a static kernel
with 'mfi' without requiring 'scbus' as well.  Ditto for KLD loading.

Submitted by:	kib
Reviewed by:	ken
MFC after:	3 days
This commit is contained in:
Scott Long 2011-10-29 06:26:49 +00:00
parent 7d3c2941c4
commit 51550f824d
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/mfi/mfivar.h
View File

@ -352,12 +352,29 @@ mfi_dequeue_bio(struct mfi_softc *sc)
return (bp);
}
/*
* This is from the original scsi_extract_sense() in CAM. It's copied
* here because CAM now uses a non-inline version that follows more complex
* additions to the SPC spec, and we don't want to force a dependency on
* the CAM module for such a trivial action.
*/
static __inline void
mfi_extract_sense(struct scsi_sense_data_fixed *sense,
int *error_code, int *sense_key, int *asc, int *ascq)
{
*error_code = sense->error_code & SSD_ERRCODE;
*sense_key = sense->flags & SSD_KEY;
*asc = (sense->extra_len >= 5) ? sense->add_sense_code : 0;
*ascq = (sense->extra_len >= 6) ? sense->add_sense_code_qual : 0;
}
static __inline void
mfi_print_sense(struct mfi_softc *sc, void *sense)
{
int error, key, asc, ascq;
scsi_extract_sense((struct scsi_sense_data *)sense,
mfi_extract_sense((struct scsi_sense_data_fixed *)sense,
&error, &key, &asc, &ascq);
device_printf(sc->mfi_dev, "sense error %d, sense_key %d, "
"asc %d, ascq %d\n", error, key, asc, ascq);