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/fdc | |
| 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/fdc')
| -rw-r--r-- | sys/dev/fdc/fdc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index aed1dac..0dd3b4c 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -317,7 +317,7 @@ struct fd_data { struct callout_handle tohandle; struct devstat *device_stats; dev_t masterdev; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 eventhandler_tag clonetag; dev_t clonedevs[NUMDENS - 1]; #endif @@ -388,7 +388,7 @@ static int fdc_detach(device_t dev); static void fdc_add_child(device_t, const char *, int); static int fdc_attach(device_t); static int fdc_print_child(device_t, device_t); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 static void fd_clone (void *, char *, int, dev_t *); #endif static int fd_probe(device_t); @@ -1121,7 +1121,7 @@ DRIVER_MODULE(fdc, pccard, fdc_pccard_driver, fdc_devclass, 0, 0); #endif /* NCARD > 0 */ -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 /* * Create a clone device upon request by devfs. */ @@ -1331,12 +1331,12 @@ fd_attach(device_t dev) struct fd_data *fd; fd = device_get_softc(dev); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 fd->clonetag = EVENTHANDLER_REGISTER(dev_clone, fd_clone, fd, 1000); #endif fd->masterdev = make_dev(&fd_cdevsw, fd->fdu << 6, UID_ROOT, GID_OPERATOR, 0640, "fd%d", fd->fdu); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 { int i; for (i = 0; i < NUMDENS - 1; i++) @@ -1359,7 +1359,7 @@ fd_detach(device_t dev) untimeout(fd_turnoff, fd, fd->toffhandle); devstat_remove_entry(fd->device_stats); destroy_dev(fd->masterdev); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 { int i; for (i = 0; i < NUMDENS - 1; i++) |
