[PATCH] Add BENQ DVD-RW 1620 to dvd+rw-booktype

[Sebastian Frei <dr.nop@gmx.net>]

Hello list,

I'm not subscribed, so please CC me.

The BENQ DVD-RW 1620 ist not recognized by dvd+rw-booktype because it is a 
generation == 0 device.

This patch moves the check for a BENQ device out of the if (generation>0 || 
hp) clause.

With the patch the drive works with dvd+rw-booktype.

S.


diff -u dvd+rw-tools-5.21.4.10.8/dvd+rw-booktype.cpp 
dvd+rw-tools-5.21.4.10.8b/dvd+rw-booktype.cpp
--- dvd+rw-tools-5.21.4.10.8/dvd+rw-booktype.cpp        2004-08-24 
23:09:28.000000000 +0200
+++ dvd+rw-tools-5.21.4.10.8b/dvd+rw-booktype.cpp       2006-01-05 
09:35:57.000000000 +0100
@@ -600,6 +600,17 @@
        return ret;
     }

+    // See if it's BENQ design...
+    cmd[0]=0xFD;
+    cmd[1]=0xF1;
+    cmd[2]='B';
+    cmd[3]='E';
+    cmd[4]='N';
+    cmd[5]='Q';
+    cmd[11]=0;
+    if (!(err=cmd.transport()))
+        return benq (cmd,action,book);
+
     if (generation>0 || hp)    // generation==0 means dual-format unit...
     {  // See if it's a RICOH design...
        cmd[0]=0x5A;    // MODE SENSE
@@ -609,17 +620,6 @@
        cmd[9]=0;
        if (!(err=cmd.transport(READ,buf,12)) && buf[8] == 0x30)
            return ricoh (cmd,action,book,generation);
-
-       // See if it's BENQ design...
-       cmd[0]=0xFD;
-       cmd[1]=0xF1;
-       cmd[2]='B';
-       cmd[3]='E';
-       cmd[4]='N';
-       cmd[5]='Q';
-       cmd[11]=0;
-       if (!(err=cmd.transport()))
-           return benq (cmd,action,book);
     }
     else
     {  // See if it's BTC design...