claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix my recent breakage in adding back GNU/Linux endian determination.

Browse Source 
Need to seet nsectors if not GNU/Linux. Some lint things for non-GNU/Linux.
This commit is contained in:
rocky
2005-01-09 01:50:56 +00:00
parent 64addbf50c
commit b33726b00e
4 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cdda_interface/cooked_interface.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cooked_interface.c,v 1.8 2005/01/09 00:47:07 rocky Exp $
$Id: cooked_interface.c,v 1.9 2005/01/09 01:50:56 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Original interface.c Copyright (C) 1994-1997
@@ -246,6 +246,14 @@ cooked_init_drive (cdrom_drive_t *d){
default:
d->nsectors=25; /* The max for SCSI MMC2 */
}
#else
{
char buffer[256];
d->nsectors = 8;
sprintf(buffer,"\tSetting read block size at %d sectors (%ld bytes).\n",
d->nsectors,(long)d->nsectors*CDIO_CD_FRAMESIZE_RAW);
cdmessage(d,buffer);
}
#endif /*HAVE_LINUX_MAJOR_H*/
d->enable_cdda = Dummy;

4
lib/cdda_interface/drive_exceptions.h
View File

@@ -1,5 +1,5 @@
/*
$Id: drive_exceptions.h,v 1.3 2005/01/08 20:39:40 rocky Exp $
$Id: drive_exceptions.h,v 1.4 2005/01/09 01:50:56 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -44,6 +44,7 @@ extern long scsi_read_mmc2(cdrom_drive_t *d, void *,long,long);
#define scsi_read_mmc2 NULL
#endif
#if HAVE_LINUX_MAJOR_H
/* list of drives that affect autosensing in ATAPI specific portions of code
(force drives to detect as ATAPI or SCSI, force ATAPI read command */
@@ -53,6 +54,7 @@ static exception_t atapi_list[]={
{"SONY CD-ROM CDU-561", 0, 0, Dummy, NULL,0},
{"Chinon CD-ROM CDS-525", 0, 0, Dummy, NULL,0},
{NULL,0,0,NULL,NULL,0}};
#endif /*HAVE_LINUX_MAJOR_H*/
/* list of drives that affect MMC default settings */

8
lib/cdda_interface/scan_devices.c
View File

@@ -1,5 +1,5 @@
/*
$Id: scan_devices.c,v 1.8 2005/01/08 20:47:03 rocky Exp $
$Id: scan_devices.c,v 1.9 2005/01/09 01:50:56 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -156,11 +156,13 @@ cdda_identify_cooked(const char *dev, int messagedest, char **messages)
{
cdrom_drive_t *d=NULL;
struct stat st;
int drive_type = 0;
char *description=NULL;
char *device = NULL;
CdIo_t *p_cdio = NULL;
#ifdef HAVE_LINUX_MAJOR_H
struct stat st;
#endif
if (dev) {
device = test_resolve_symlink(dev,messagedest,messages);
@@ -239,7 +241,7 @@ cdda_identify_cooked(const char *dev, int messagedest, char **messages)
}
}
}
#endif /* HAVE_LINUX_MAJOR_H */
#endif /*HAVE_LINUX_MAJOR_H*/
/* Minimum init */