Recording and retrieval of SCSI sense reply for GNU/Linux.

NEWS

@@ -2,6 +2,7 @@ version 0.83 (git)
 
 - Add Recording and retrieval of SCSI sense reply. 
 - Add Write/burning interface.
+- MMC bug fixes
 - Tolerance for OS's without timezone in their struct tm (e.g. Solaris)
   added iso9660_set_{d,l}time_with_timezone
 

THANKS

@@ -64,6 +64,7 @@ xboxmediacenter team (www.xboxmediacenter.de)
 
 Thomas Schmitt
   Recording and retrieval of SCSI sense reply. Write/burning interface.
+  MMC bug fixes
 
 Daniel Schwarz
  log-summary option in cd-paranoia.

lib/driver/gnu_linux.c

@@ -1,6 +1,4 @@
 /*
-  $Id: gnu_linux.c,v 1.33 2008/06/25 07:46:21 rocky Exp $
-
   Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2009
     Rocky Bernstein <rocky@gnu.org>
@@ -86,7 +84,8 @@ typedef enum {
   _AM_IOCTL,
   _AM_READ_CD,
   _AM_READ_10,
-  _AM_MMC_RDWR
+  _AM_MMC_RDWR,
+  _AM_MMC_RDWR_EXCL,
 } access_mode_t;
 
 typedef struct {
@@ -135,6 +134,8 @@ str_to_access_mode_linux(const char *psz_access_mode)
     return _AM_READ_10;
   else if (!strcmp(psz_access_mode, "MMC_RDWR"))
     return _AM_MMC_RDWR;
+  else if (!strcmp(psz_access_mode, "MMC_RDWR_EXCL"))
+    return _AM_MMC_RDWR_EXCL;
   else {
     cdio_warn ("unknown access type: %s. Default IOCTL used.", 
                psz_access_mode);
@@ -379,6 +380,8 @@ get_arg_linux (void *env, const char key[])
       return "READ_10";
     case _AM_MMC_RDWR:
       return "MMC_RDWR";
+    case _AM_MMC_RDWR_EXCL:
+      return "MMC_RDWR_EXCL";
     case _AM_NONE:
       return "no access method";
     }
@@ -1074,6 +1077,7 @@ _read_mode2_sector_linux (void *p_user_data, void *p_data, lsn_t lsn,
       
     case _AM_IOCTL:
     case _AM_MMC_RDWR:
+    case _AM_MMC_RDWR_EXCL:
       if (ioctl (p_env->gen.fd, CDROMREADMODE2, &buf) == -1)
         {
           perror ("ioctl()");
@@ -1227,20 +1231,45 @@ run_mmc_cmd_linux( void *p_user_data,
                   cdio_mmc_direction_t e_direction, 
                   unsigned int i_buf, /*in/out*/ void *p_buf)
 {
-  const _img_private_t *p_env = p_user_data;
+  _img_private_t *p_env = p_user_data;
   struct cdrom_generic_command cgc;
+  struct request_sense sense;
+  unsigned char *u_sense = (unsigned char *) &sense;
+  int sense_size;
+
+  p_env->gen.scsi_mmc_sense_valid = 0;
   memset (&cgc, 0, sizeof (struct cdrom_generic_command));
   memcpy(&cgc.cmd, p_cdb, i_cdb);
   cgc.buflen = i_buf;
   cgc.buffer = p_buf;
- cgc.data_direction = (SCSI_MMC_DATA_READ == e_direction)
-   ? CGC_DATA_READ : CGC_DATA_WRITE;
+
+  cgc.sense = &sense;
+
+  if (SCSI_MMC_DATA_NONE == e_direction)
+    i_buf = 0;
+  cgc.data_direction = (SCSI_MMC_DATA_READ == e_direction) ? CGC_DATA_READ :
+                       (SCSI_MMC_DATA_WRITE == e_direction) ? CGC_DATA_WRITE :
+                       CGC_DATA_NONE;
+
 #ifdef HAVE_LINUX_CDROM_TIMEOUT
   cgc.timeout = i_timeout_ms;
 #endif
 
+  memset(u_sense, 0, sizeof(sense));
   { 
     int i_rc = ioctl (p_env->gen.fd, CDROM_SEND_PACKET, &cgc);
+
+    /* Record SCSI sense reply for API call mmc_last_cmd_sense(). 
+    */
+    if (u_sense[7]) {
+      sense_size = u_sense[7] + 8; /* SPC 4.5.3, Table 26 :
+                                      252 bytes legal , 263 bytes possible */
+      if (sense_size > sizeof(sense))
+        sense_size = sizeof(sense);
+      memcpy((void *) p_env->gen.scsi_mmc_sense, &sense, sense_size);
+      p_env->gen.scsi_mmc_sense_valid = sense_size;
+    }
+
     if (0 == i_rc) return DRIVER_OP_SUCCESS;
     if (-1 == i_rc) {
       cdio_info ("ioctl CDROM_SEND_PACKET failed: %s", strerror(errno));  
@@ -1648,9 +1677,13 @@ cdio_open_am_linux (const char *psz_orig_source, const char *access_mode)
 
   ret->driver_id = DRIVER_LINUX;
 
-  open_access_mode = (_AM_MMC_RDWR == _data->access_mode) 
-      ? (O_RDWR|O_EXCL|O_NONBLOCK) : (O_RDONLY|O_NONBLOCK);
-      
+  open_access_mode = O_NONBLOCK;
+  if (_AM_MMC_RDWR == _data->access_mode)
+    open_access_mode |= O_RDWR;
+  else if (_AM_MMC_RDWR_EXCL == _data->access_mode)
+    open_access_mode |= O_RDWR | O_EXCL;
+  else
+    open_access_mode |= O_RDONLY;
   if (cdio_generic_init(_data, open_access_mode)) {
     return ret;
   } else {

lib/driver/solaris.c

@@ -1,7 +1,6 @@
 /*
-  $Id: solaris.c,v 1.12 2008/04/22 15:29:12 karl Exp $
-
-  Copyright (C) 2002, 2003, 2004, 2005, 2006 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009
+  Rocky Bernstein <rocky@gnu.org>
   Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
 
   This program is free software: you can redistribute it and/or modify