mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00
Code Issues Releases Activity

Rename ATA probe driver to "aprobe" to resolve name conflict with SCSI

Browse Source 
and fix loading cam as module.

Approved by:	re (implicitly)
This commit is contained in:
Alexander Motin 2009-07-13 06:12:21 +00:00
parent 6b560b8e98
commit f09f8e3e0b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=195653
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/cam/ata/ata_xpt.c
View File

@ -83,11 +83,11 @@ static periph_init_t probe_periph_init;
static struct periph_driver probe_driver =
{
probe_periph_init, "probe",
probe_periph_init, "aprobe",
TAILQ_HEAD_INITIALIZER(probe_driver.units)
};
PERIPHDRIVER_DECLARE(probe, probe_driver);
PERIPHDRIVER_DECLARE(aprobe, probe_driver);
typedef enum {
PROBE_RESET,
@ -1311,7 +1311,7 @@ ata_scan_lun(struct cam_periph *periph, struct cam_path *path,
request_ccb->crcn.flags = flags;
}
if ((old_periph = cam_periph_find(path, "probe")) != NULL) {
if ((old_periph = cam_periph_find(path, "aprobe")) != NULL) {
probe_softc *softc;
softc = (probe_softc *)old_periph->softc;
@ -1319,7 +1319,7 @@ ata_scan_lun(struct cam_periph *periph, struct cam_path *path,
periph_links.tqe);
} else {
status = cam_periph_alloc(proberegister, NULL, probecleanup,
probestart, "probe",
probestart, "aprobe",
CAM_PERIPH_BIO,
request_ccb->ccb_h.path, NULL, 0,
request_ccb);