Remove d->interface.
This commit is contained in:
@@ -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) 2005 Rocky Bernstein <rocky@panix.com>
|
||||||
Copyright (C) 1998 Monty xiphmont@mit.edu
|
Copyright (C) 1998 Monty xiphmont@mit.edu
|
||||||
@@ -97,25 +97,8 @@ cdio_cddap_open(cdrom_drive_t *d)
|
|||||||
int ret;
|
int ret;
|
||||||
if(d->opened)return(0);
|
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)) )
|
if ( (ret=cooked_init_drive(d)) )
|
||||||
return(ret);
|
return(ret);
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Check TOC, enable for CDDA */
|
/* Check TOC, enable for CDDA */
|
||||||
|
|
||||||
|
|||||||
@@ -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) 2004, 2005 Rocky Bernstein <rocky@panix.com>
|
||||||
Copyright (C) 1998 Monty xiphmont@mit.edu
|
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->p_cdio = p_cdio;
|
||||||
d->cdda_device_name = strdup(psz_device);
|
d->cdda_device_name = strdup(psz_device);
|
||||||
d->drive_type = drive_type;
|
d->drive_type = drive_type;
|
||||||
d->interface = COOKED_IOCTL;
|
|
||||||
d->bigendianp = -1; /* We don't know yet... */
|
d->bigendianp = -1; /* We don't know yet... */
|
||||||
d->nsectors = -1;
|
d->nsectors = -1;
|
||||||
d->b_swap_bytes = true;
|
d->b_swap_bytes = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user