diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ata/atapi-cd.c | 10 | ||||
| -rw-r--r-- | sys/dev/ata/atapi-cd.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index 7a208b93a8caa..3b4f26e281db6 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); -#ifdef BURN_BRIDGES +#ifndef BURN_BRIDGES 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; } -#ifdef BURN_BRIDGES +#ifndef BURN_BRIDGES static void acd_clone(void *arg, char *name, int namelen, dev_t *dev) { @@ -289,10 +289,10 @@ acd_clone(void *arg, char *name, int namelen, dev_t *dev) if (!dev_stdclone(name, &p, "acd", &unit)) return; #ifdef GONE_IN_5 - if (*p != '\0') + if (*p != '\0' && strcmp(p, "a") != 0 && strcmp(p, "c") != 0) return; #else - if (*p != '\0' && strcmp(p, "a") != 0 && strcmp(p, "c") != 0) + if (*p != '\0') return; #endif if (unit == cdp->lun) @@ -310,7 +310,7 @@ acd_make_dev(struct acd_softc *cdp) dev->si_drv1 = cdp; cdp->dev = dev; cdp->device->flags |= ATA_D_MEDIA_CHANGED; -#ifdef BURN_BRIDGES +#ifndef BURN_BRIDGES cdp->clone_evh = EVENTHANDLER_REGISTER(dev_clone, acd_clone, cdp, 1000); #endif acd_set_ioparm(cdp); diff --git a/sys/dev/ata/atapi-cd.h b/sys/dev/ata/atapi-cd.h index 1e5d24b87b591..190b651bdcd61 100644 --- a/sys/dev/ata/atapi-cd.h +++ b/sys/dev/ata/atapi-cd.h @@ -322,7 +322,7 @@ struct acd_softc { u_int block_size; /* blocksize currently used */ struct devstat *stats; /* devstat entry */ dev_t dev; /* device place holders */ -#ifdef BURN_BRIDGES +#ifndef BURN_BRIDGES eventhandler_tag clone_evh; #endif }; |