Search
lxdream.org :: lxdream/src/drivers/cdrom/cd_osx.c :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/drivers/cdrom/cd_osx.c
changeset 1298:d0eb2307b847
prev1168:66e5113d4155
author nkeynes
date Fri May 29 18:47:05 2015 +1000 (8 years ago)
permissions -rw-r--r--
last change Fix test case
file annotate diff log raw
1.1 --- a/src/drivers/cdrom/cd_osx.c Wed Mar 30 21:51:54 2011 +1000
1.2 +++ b/src/drivers/cdrom/cd_osx.c Fri May 29 18:47:05 2015 +1000
1.3 @@ -33,8 +33,6 @@
1.4 #define MAXTOCENTRIES 600 /* This is a fairly generous overestimate really */
1.5 #define MAXTOCSIZE 4 + (MAXTOCENTRIES*11)
1.6
1.7 -static gboolean cdrom_osx_image_is_valid( FILE *f );
1.8 -static cdrom_disc_t cdrom_osx_open_file( FILE *f, const gchar *filename, ERROR *err );
1.9 static gboolean cdrom_osx_read_toc( cdrom_disc_t disc, ERROR *err );
1.10 static cdrom_error_t cdrom_osx_read_sectors( sector_source_t disc, cdrom_lba_t sector, cdrom_count_t count,
1.11 cdrom_read_mode_t mode, unsigned char *buf, size_t *length );
1.12 @@ -77,8 +75,6 @@
1.13
1.14 static cdrom_disc_t cdrom_osx_open( cdrom_drive_t drive, ERROR *err )
1.15 {
1.16 - cdrom_disc_t result = NULL;
1.17 -
1.18 osx_cdrom_drive_t osx_drive = osx_cdrom_open_drive(drive->name);
1.19 if( osx_drive == NULL ) {
1.20 SET_ERROR( err, LX_ERR_FILE_NOOPEN, "Unable to open CDROM drive" );
1.21 @@ -106,16 +102,6 @@
1.22 osx_register_iokit_notifications();
1.23 }
1.24
1.25 -static gboolean cdrom_osx_image_is_valid( FILE *f )
1.26 -{
1.27 - return FALSE;
1.28 -}
1.29 -
1.30 -static cdrom_disc_t cdrom_osx_open_file( FILE *f, const gchar *filename, ERROR *err )
1.31 -{
1.32 - return NULL; /* Not supported */
1.33 -}
1.34 -
1.35 static gboolean cdrom_osx_read_toc( cdrom_disc_t disc, ERROR *err )
1.36 {
1.37 osx_cdrom_drive_t drive = OSX_DRIVE(disc);
1.38 @@ -152,7 +138,7 @@
1.39 {
1.40 cdrom_disc_t disc = (cdrom_disc_t)source;
1.41 int sector_size = 2352;
1.42 - char data[CDROM_MAX_SECTOR_SIZE];
1.43 + unsigned char data[CDROM_MAX_SECTOR_SIZE];
1.44 osx_cdrom_drive_t drive = OSX_DRIVE(disc);
1.45
1.46 int fh = osx_cdrom_get_media_handle(drive);
.