From a35a0a61d3459a316722671ddc732dc98a683620 Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Sat, 5 Feb 2005 04:23:56 +0000
Subject: [PATCH] Remove d->interface.

---
 lib/cdda_interface/interface.c    | 19 +------------------
 lib/cdda_interface/scan_devices.c |  3 +--
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/lib/cdda_interface/interface.c b/lib/cdda_interface/interface.c
index 61a91c5d..1c85ffe9 100644
--- a/lib/cdda_interface/interface.c
+++ b/lib/cdda_interface/interface.c
@@ -1,5 +1,5 @@
 /*
-  $Id: interface.c,v 1.18 2005/01/27 03:10:06 rocky Exp $
+  $Id: interface.c,v 1.19 2005/02/05 04:23:56 rocky Exp $
 
   Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -97,25 +97,8 @@ cdio_cddap_open(cdrom_drive_t *d)
   int ret;
   if(d->opened)return(0);
 
-#if HAVE_SCSI_HANDLING
-  switch(d->interface){
-  case GENERIC_SCSI:  
-    if((ret=scsi_init_drive(d)))
-      return(ret);
-    break;
-  case COOKED_IOCTL:  
-    if((ret=cooked_init_drive(d)))
-      return(ret);
-    break;
-  default:
-    cderror(d, "100: Interface not supported\n");
-    return(-100);
-  }
-#else 
-  d->interface = COOKED_IOCTL;
   if ( (ret=cooked_init_drive(d)) )
     return(ret);
-#endif
   
   /* Check TOC, enable for CDDA */
   
diff --git a/lib/cdda_interface/scan_devices.c b/lib/cdda_interface/scan_devices.c
index 4cbaf761..65f748be 100644
--- a/lib/cdda_interface/scan_devices.c
+++ b/lib/cdda_interface/scan_devices.c
@@ -1,5 +1,5 @@
 /*
-  $Id: scan_devices.c,v 1.20 2005/02/03 08:07:24 rocky Exp $
+  $Id: scan_devices.c,v 1.21 2005/02/05 04:23:56 rocky Exp $
 
   Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -268,7 +268,6 @@ cdda_identify_device_cdio(CdIo_t *p_cdio, const char *psz_device,
   d->p_cdio           = p_cdio;
   d->cdda_device_name = strdup(psz_device);
   d->drive_type       = drive_type;
-  d->interface        = COOKED_IOCTL;
   d->bigendianp       = -1; /* We don't know yet... */
   d->nsectors         = -1;
   d->b_swap_bytes     = true;