Remove sequence checking in the burner support.

This was really a leftover from the wormcontrol days, it is no longer
needed when using burncd.

2 files changed, 4 insertions, 49 deletions

diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 9cd87d2..71c46f3 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -234,7 +234,6 @@ acd_init_lun(struct atapi_softc *atp, struct devstat *stats)
     bioq_init(&cdp->bio_queue);
     cdp->atp = atp;
     cdp->lun = ata_get_lun(&acd_lun_map);
-    cdp->flags &= ~(F_WRITTEN|F_DISK_OPEN|F_TRACK_OPEN);
     cdp->block_size = 2048;
     cdp->slot = -1;
     cdp->changer_info = NULL;
@@ -977,51 +976,18 @@ acdioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flags, struct proc *p)
 	break;
  
     case CDRIOCOPENDISK:
-	if ((cdp->flags & F_WRITTEN) || (cdp->flags & F_DISK_OPEN)) {
-	    error = EINVAL;
-	    printf("acd%d: sequence error (disk already open)\n", cdp->lun);
-	}
-	cdp->flags &= ~(F_WRITTEN | F_TRACK_OPEN);
-	cdp->flags |= F_DISK_OPEN;
 	break;
 
     case CDRIOCOPENTRACK:
-	if (!(cdp->flags & F_DISK_OPEN)) {
-	    error = EINVAL;
-	    printf("acd%d: sequence error (disk not open)\n", cdp->lun);
-	} 
-	else {
-	    if ((error = acd_open_track(cdp, (struct cdr_track *)addr)))
-		break;
-	    cdp->flags |= F_TRACK_OPEN;
-	}
+	error = acd_open_track(cdp, (struct cdr_track *)addr);
 	break;
 
     case CDRIOCCLOSETRACK:
-	if (!(cdp->flags & F_TRACK_OPEN)) {
-	    error = EINVAL;
-	    printf("acd%d: sequence error (no track open)\n", cdp->lun);
-	}
-	else {
-	    if (cdp->flags & F_WRITTEN) {
-		acd_close_track(cdp);
-		cdp->flags &= ~F_TRACK_OPEN;
-	    }
-	}
+	error = acd_close_track(cdp);
 	break;
 
     case CDRIOCCLOSEDISK:
-	if (!(cdp->flags & F_DISK_OPEN)) {
-	    error = EINVAL;
-	    printf("acd%d: sequence error (nothing to close)\n", cdp->lun);
-	}
-	else if (!(cdp->flags & F_WRITTEN)) {
-	    cdp->flags &= ~(F_DISK_OPEN | F_TRACK_OPEN);
-	}
-	else {
-	    error = acd_close_disk(cdp);
-	    cdp->flags &= ~(F_WRITTEN | F_DISK_OPEN | F_TRACK_OPEN);
-	}
+	error = acd_close_disk(cdp);
 	break;
 
     case CDRIOCWRITESPEED:
@@ -1192,11 +1158,8 @@ acd_done(struct atapi_request *request)
 	bp->bio_error = request->error;
 	bp->bio_flags |= BIO_ERROR;
     }	
-    else {
+    else
 	bp->bio_resid = bp->bio_bcount - request->donecount;
-	if (bp->bio_cmd == BIO_WRITE)
-	    cdp->flags |= F_WRITTEN;
-    }
     devstat_end_transaction_bio(cdp->stats, bp);
     biodone(bp);
     return 0;
@@ -1214,9 +1177,6 @@ acd_read_toc(struct acd_softc *cdp)
 
     atapi_test_ready(cdp->atp);
 
-    if (cdp->atp->flags & ATAPI_F_MEDIA_CHANGED)
-	cdp->flags &= ~(F_WRITTEN | F_DISK_OPEN | F_TRACK_OPEN);
-
     cdp->atp->flags &= ~ATAPI_F_MEDIA_CHANGED;
 
     len = sizeof(struct ioc_toc_header) + sizeof(struct cd_toc_entry);
@@ -1736,7 +1696,6 @@ acd_eject(struct acd_softc *cdp, int32_t close)
 	return 0;
     acd_prevent_allow(cdp, 0);
     cdp->flags &= ~F_LOCKED;
-    cdp->flags &= ~(F_WRITTEN | F_DISK_OPEN | F_TRACK_OPEN);
     cdp->atp->flags |= ATAPI_F_MEDIA_CHANGED;
     return acd_start_stop(cdp, 2);
 }
@@ -1749,7 +1708,6 @@ acd_blank(struct acd_softc *cdp)
     int32_t error;
 
     error = atapi_queue_cmd(cdp->atp, ccb, NULL, 0, 0, 60*60, NULL, NULL);
-    cdp->flags &= ~(F_WRITTEN | F_DISK_OPEN | F_TRACK_OPEN);
     cdp->atp->flags |= ATAPI_F_MEDIA_CHANGED;
     return error;
 }
diff --git a/sys/dev/ata/atapi-cd.h b/sys/dev/ata/atapi-cd.h
index eada0c1..72b70e8 100644
--- a/sys/dev/ata/atapi-cd.h
+++ b/sys/dev/ata/atapi-cd.h
@@ -312,9 +312,6 @@ struct acd_softc {
     int32_t			lun;		/* logical device unit */
     int32_t			flags;		/* device state flags */
 #define 	F_LOCKED		0x0001	/* this unit is locked */
-#define 	F_WRITTEN		0x0002	/* medium has been written to */
-#define 	F_DISK_OPEN		0x0004	/* disk open for writing */
-#define 	F_TRACK_OPEN		0x0008	/* track open for writing */
 
     struct bio_queue_head	bio_queue;	/* Queue of i/o requests */
     struct toc			toc;		/* table of disc contents */