From f9fe21cb6a36f9e3d9e29eab36b8e0ad195cf68c Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Thu, 5 Aug 2004 02:58:46 +0000
Subject: [PATCH] Was passing in the wrong pointer (p_cdio instead of p_env)

---
 lib/MSWindows/aspi32.c      | 6 +++---
 lib/MSWindows/win32_ioctl.c | 6 +++---
 lib/scsi_mmc.c              | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/MSWindows/aspi32.c b/lib/MSWindows/aspi32.c
index 43508113..ab59bc32 100644
--- a/lib/MSWindows/aspi32.c
+++ b/lib/MSWindows/aspi32.c
@@ -1,5 +1,5 @@
 /*
-    $Id: aspi32.c,v 1.46 2004/07/29 04:14:44 rocky Exp $
+    $Id: aspi32.c,v 1.47 2004/08/05 02:58:46 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.46 2004/07/29 04:14:44 rocky Exp $";
+static const char _rcsid[] = "$Id: aspi32.c,v 1.47 2004/08/05 02:58:46 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -771,7 +771,7 @@ wnaspi32_eject_media (void *user_data) {
 bool
 init_cdtext_aspi (_img_private_t *p_env)
 {
-  return scsi_mmc_init_cdtext_private( p_env->gen.cdio,
+  return scsi_mmc_init_cdtext_private( p_env,
 				       &run_scsi_cmd_aspi, 
 				       set_cdtext_field_win32
 				       );
diff --git a/lib/MSWindows/win32_ioctl.c b/lib/MSWindows/win32_ioctl.c
index a24e84d9..e9793497 100644
--- a/lib/MSWindows/win32_ioctl.c
+++ b/lib/MSWindows/win32_ioctl.c
@@ -1,5 +1,5 @@
 /*
-    $Id: win32_ioctl.c,v 1.33 2004/07/29 04:14:44 rocky Exp $
+    $Id: win32_ioctl.c,v 1.34 2004/08/05 02:58:46 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.33 2004/07/29 04:14:44 rocky Exp $";
+static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.34 2004/08/05 02:58:46 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -513,7 +513,7 @@ read_toc_win32ioctl (_img_private_t *env)
 bool
 init_cdtext_win32ioctl (_img_private_t *p_env)
 {
-  return scsi_mmc_init_cdtext_private( p_env->gen.cdio,
+  return scsi_mmc_init_cdtext_private( p_env,
 				       &run_scsi_cmd_win32ioctl, 
 				       set_cdtext_field_win32
 				       );
diff --git a/lib/scsi_mmc.c b/lib/scsi_mmc.c
index 9f70d843..d8a6a5bd 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.19 2004/08/01 11:28:00 rocky Exp $
+    $Id: scsi_mmc.c,v 1.20 2004/08/05 02:58:46 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -510,6 +510,7 @@ scsi_mmc_init_cdtext_private ( void *p_user_data,
   /* Operation code */
   CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_TOC);
 
+  cdb.field[1] = CDIO_CDROM_MSF;
   /* Format */
   cdb.field[2] = CDIO_MMC_READTOC_FMT_CDTEXT;