lkml.org 
[lkml]   [2006]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 4/5] pktcdvd: Fix the logic in the pkt_writable_track function
From
Date
Fix the pkt_writable_track() function to make it work correctly for
all types of CD/DVD discs.

Signed-off-by: Peter Osterlund <petero2@telia.com>
---

drivers/block/pktcdvd.c | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index dba5ce7..dec68d0 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -1500,28 +1500,30 @@ static int pkt_set_write_settings(struct
/*
* 1 -- we can write to this track, 0 -- we can't
*/
-static int pkt_writable_track(track_information *ti)
+static int pkt_writable_track(struct pktcdvd_device *pd, track_information *ti)
{
- /*
- * only good for CD-RW at the moment, not DVD-RW
- */
+ switch (pd->mmc3_profile) {
+ case 0x1a: /* DVD+RW */
+ case 0x12: /* DVD-RAM */
+ /* The track is always writable on DVD+RW/DVD-RAM */
+ return 1;
+ default:
+ break;
+ }

- /*
- * FIXME: only for FP
- */
- if (ti->fp == 0)
- return 1;
+ if (!ti->packet || !ti->fp)
+ return 0;

/*
* "good" settings as per Mt Fuji.
*/
- if (ti->rt == 0 && ti->blank == 0 && ti->packet == 1)
+ if (ti->rt == 0 && ti->blank == 0)
return 1;

- if (ti->rt == 0 && ti->blank == 1 && ti->packet == 1)
+ if (ti->rt == 0 && ti->blank == 1)
return 1;

- if (ti->rt == 1 && ti->blank == 0 && ti->packet == 1)
+ if (ti->rt == 1 && ti->blank == 0)
return 1;

printk("pktcdvd: bad state %d-%d-%d\n", ti->rt, ti->blank, ti->packet);
@@ -1606,7 +1608,7 @@ static int pkt_probe_settings(struct pkt
return ret;
}

- if (!pkt_writable_track(&ti)) {
+ if (!pkt_writable_track(pd, &ti)) {
printk("pktcdvd: can't write to this track\n");
return -ENXIO;
}
--
Peter Osterlund - petero2@telia.com
http://web.telia.com/~u89404340
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-02-19 17:00    [W:0.040 / U:0.988 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site