From 801828fd5c0f8ae4676ededf5c8852187939d6e2 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sat, 9 Jan 2010 14:32:51 +0000 Subject: [PATCH] Revoked asynchronous eject, as we cannot distinguish out from unready --- libburn/trunk/libburn/sbc.c | 7 +++++-- libburn/trunk/libburn/spc.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libburn/trunk/libburn/sbc.c b/libburn/trunk/libburn/sbc.c index 429ed70c..f06e889d 100644 --- a/libburn/trunk/libburn/sbc.c +++ b/libburn/trunk/libburn/sbc.c @@ -74,14 +74,17 @@ void sbc_eject(struct burn_drive *d) return; scsi_init_command(&c, SBC_UNLOAD, sizeof(SBC_UNLOAD)); - c.opcode[1] |= 1; /* ts A70918 : Immed */ + /* c.opcode[1] |= 1; / * ts A70918 : Immed , ts B00109 : revoked */ c.page = NULL; c.dir = NO_TRANSFER; d->issue_command(d, &c); + /* ts A70918 : Wait long. A late eject could surprise or hurt user. + ts B00109 : Asynchronous eject revoked, as one cannot reliably + distinguish out from unready. if (c.error) return; - /* ts A70918 : Wait long. A late eject could surprise or hurt user. */ spc_wait_unit_attention(d, 1800, "STOP UNIT (+ EJECT)", 0); + */ } diff --git a/libburn/trunk/libburn/spc.c b/libburn/trunk/libburn/spc.c index d8814007..ad44ab19 100644 --- a/libburn/trunk/libburn/spc.c +++ b/libburn/trunk/libburn/spc.c @@ -961,7 +961,7 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense, if (senselen<=0 || senselen>13) *ascq = sense[13]; - sprintf(msg, "[%X %2.2X %2.2X]", (*key) & 0xf, *asc, *ascq); + sprintf(msg, "[%X %2.2X %2.2X] ", (*key) & 0xf, *asc, *ascq); msg= msg + strlen(msg); burn_print(12, "CONDITION: 0x%x 0x%x 0x%x on %s %s\n",