From 8000e161a2e0d89c5775ed9b58eb98d0aa61c64f Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Mon, 26 Jul 2004 04:33:21 +0000
Subject: [PATCH] get_dvd_physical common routine now works.

---
 lib/MSWindows/aspi32.c |  6 +++---
 lib/scsi_mmc.c         | 14 +++++++-------
 lib/scsi_mmc_private.h |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/MSWindows/aspi32.c b/lib/MSWindows/aspi32.c
index 135d49f7..8ffe8a28 100644
--- a/lib/MSWindows/aspi32.c
+++ b/lib/MSWindows/aspi32.c
@@ -1,5 +1,5 @@
 /*
-    $Id: aspi32.c,v 1.38 2004/07/26 03:58:25 rocky Exp $
+    $Id: aspi32.c,v 1.39 2004/07/26 04:33:21 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: aspi32.c,v 1.38 2004/07/26 03:58:25 rocky Exp $";
+static const char _rcsid[] = "$Id: aspi32.c,v 1.39 2004/07/26 04:33:21 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -192,7 +192,7 @@ get_discmode_aspi (_img_private_t *p_env)
   dvd.physical.type = CDIO_DVD_STRUCT_PHYSICAL;
   dvd.physical.layer_num = 0;
   if (0 == get_dvd_struct_physical_mmc (p_env, 
-					&scsi_mmc_run_cmd_aspi,
+					scsi_mmc_run_cmd_aspi,
 					&dvd)) {
     switch(dvd.physical.layer[0].book_type) {
     case CDIO_DVD_BOOK_DVD_ROM:  return CDIO_DISC_MODE_DVD_ROM;
diff --git a/lib/scsi_mmc.c b/lib/scsi_mmc.c
index e19a68c8..46d5d0cc 100644
--- a/lib/scsi_mmc.c
+++ b/lib/scsi_mmc.c
@@ -1,6 +1,6 @@
 /*  Common SCSI Multimedia Command (MMC) routines.
 
-    $Id: scsi_mmc.c,v 1.10 2004/07/26 03:58:25 rocky Exp $
+    $Id: scsi_mmc.c,v 1.11 2004/07/26 04:33:21 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -237,7 +237,7 @@ scsi_mmc_set_bsize ( const CdIo *cdio, unsigned int bsize)
 */
 discmode_t
 get_dvd_struct_physical_mmc ( void *p_env, 
-			      const scsi_mmc_run_cmd_fn_t *run_scsi_mmc_cmd, 
+			      const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd, 
 			      cdio_dvd_struct_t *s)
 {
   scsi_mmc_cdb_t cdb = {{0, }};
@@ -258,10 +258,10 @@ get_dvd_struct_physical_mmc ( void *p_env,
   cdb.field[7] = CDIO_DVD_STRUCT_PHYSICAL;
   cdb.field[9] = sizeof(buf) & 0xff;
   
-  i_status = (*run_scsi_mmc_cmd)(p_env, DEFAULT_TIMEOUT_MS, 
-				scsi_mmc_get_cmd_len(cdb.field[0]), 
-				&cdb, SCSI_MMC_DATA_READ, 
-				sizeof(buf), &buf);
+  i_status = run_scsi_mmc_cmd(p_env, DEFAULT_TIMEOUT_MS, 
+			      scsi_mmc_get_cmd_len(cdb.field[0]), 
+			      &cdb, SCSI_MMC_DATA_READ, 
+			      sizeof(buf), &buf);
   if (0 != i_status)
     return CDIO_DISC_MODE_ERROR;
   
@@ -299,7 +299,7 @@ scsi_mmc_get_dvd_struct_physical ( const CdIo *p_cdio, cdio_dvd_struct_t *s)
 {
   if ( ! p_cdio )  return -2;
   return get_dvd_struct_physical_mmc (p_cdio->env, 
-				      (&p_cdio->op.run_scsi_mmc_cmd), 
+				      p_cdio->op.run_scsi_mmc_cmd, 
 				      s);
 }
 
diff --git a/lib/scsi_mmc_private.h b/lib/scsi_mmc_private.h
index 9ad63fc7..19eae9f1 100644
--- a/lib/scsi_mmc_private.h
+++ b/lib/scsi_mmc_private.h
@@ -1,6 +1,6 @@
 /*  private MMC helper routines.
 
-    $Id: scsi_mmc_private.h,v 1.3 2004/07/26 03:58:25 rocky Exp $
+    $Id: scsi_mmc_private.h,v 1.4 2004/07/26 04:33:21 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -37,7 +37,7 @@ int set_bsize_mmc ( const void *p_env,
 */
 discmode_t 
 get_dvd_struct_physical_mmc ( void *p_env, 
-			      const scsi_mmc_run_cmd_fn_t *run_scsi_mmc_cmd, 
+			      const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd, 
 			      cdio_dvd_struct_t *s );