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/dev/ata/atapi-cd.c | |
| 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/dev/ata/atapi-cd.c')
| -rw-r--r-- | sys/dev/ata/atapi-cd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index e404b12..6d82779 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -243,7 +243,7 @@ acd_detach(struct ata_device *atadev) free(entry, M_ACD); } destroy_dev(cdp->dev); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 EVENTHANDLER_DEREGISTER(dev_clone, cdp->clone_evh); #endif devstat_remove_entry(cdp->stats); @@ -276,7 +276,7 @@ acd_init_lun(struct ata_device *atadev) return cdp; } -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 static void acd_clone(void *arg, char *name, int namelen, dev_t *dev) { @@ -305,7 +305,7 @@ acd_make_dev(struct acd_softc *cdp) dev->si_drv1 = cdp; cdp->dev = dev; cdp->device->flags |= ATA_D_MEDIA_CHANGED; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 cdp->clone_evh = EVENTHANDLER_REGISTER(dev_clone, acd_clone, cdp, 1000); #endif acd_set_ioparm(cdp); |
