diff options
| author | phk <phk@FreeBSD.org> | 2003-09-11 19:27:24 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-09-11 19:27:24 +0000 |
| commit | 1ea5197e3f7af28d45665d66279ded2085a9556c (patch) | |
| tree | 4bed42261a95116ad2c815d0e5531ccec15b61e8 /sys/cam | |
| parent | 3b78f25cc9aec5f66931f365ee24b63cb5af08ce (diff) | |
| download | FreeBSD-src-1ea5197e3f7af28d45665d66279ded2085a9556c.zip FreeBSD-src-1ea5197e3f7af28d45665d66279ded2085a9556c.tar.gz | |
Disable the use of cloning use in floppy and CD drivers.
This commit puts the relevant code snippets under #ifdef GONE_IN_5
(rather than #ifndef BURN_BRIDGES) thereby disabling the code now.
The code wil be entirely removed before 5.2 unless we find reasons
why this would be a bad idea.
Approach suggested by: imp
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/scsi/scsi_cd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index e321b96..2f1afb5 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -152,7 +152,7 @@ struct cd_softc { int bufs_left; struct cam_periph *periph; dev_t dev; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 eventhandler_tag clonetag; #endif int minimum_command_size; @@ -343,7 +343,7 @@ struct cdchanger { static STAILQ_HEAD(changerlist, cdchanger) changerq; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 static void cdclone(void *arg, char *name, int namelen, dev_t *dev) { @@ -535,7 +535,7 @@ cdcleanup(struct cam_periph *periph) } devstat_remove_entry(softc->device_stats); destroy_dev(softc->dev); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 EVENTHANDLER_DEREGISTER(dev_clone, softc->clonetag); #endif free(softc, M_DEVBUF); @@ -782,7 +782,7 @@ cdregister(struct cam_periph *periph, void *arg) softc->dev = make_dev(&cd_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0640, "cd%d", periph->unit_number); softc->dev->si_drv1 = periph; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 softc->clonetag = EVENTHANDLER_REGISTER(dev_clone, cdclone, softc, 1000); #endif |
