folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DISK: Add Linux host support for direct CDROM access

Browse source
This commit is contained in:
Mark Pizzolato 2018-05-26 12:33:50 -07:00
parent 874f60cbaa
commit 83234f1e9d
2 changed files with 57 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
makefile
View file

@ -495,6 +495,12 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
ifneq (,$(call find_include,semaphore)) ifneq (,$(call find_include,semaphore))
OS_CCDEFS += -DHAVE_SEMAPHORE OS_CCDEFS += -DHAVE_SEMAPHORE
endif endif
ifneq (,$(call find_include,sys/ioctl))
OS_CCDEFS += -DHAVE_SYS_IOCTL
endif
ifneq (,$(call find_include,linux/cdrom))
OS_CCDEFS += -DHAVE_LINUX_CDROM
endif
ifneq (,$(call find_include,dlfcn)) ifneq (,$(call find_include,dlfcn))
ifneq (,$(call find_lib,dl)) ifneq (,$(call find_lib,dl))
OS_CCDEFS += -DHAVE_DLOPEN=$(LIBEXT) OS_CCDEFS += -DHAVE_DLOPEN=$(LIBEXT)

51
sim_disk.c
View file

@ -2608,6 +2608,12 @@ return SCPE_IOERR;
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#if defined(HAVE_SYS_IOCTL)
#include <sys/ioctl.h>
#endif
#if defined(HAVE_LINUX_CDROM)
#include <linux/cdrom.h>
#endif
static t_stat sim_os_disk_implemented_raw (void) static t_stat sim_os_disk_implemented_raw (void)
{ {
@ -2659,11 +2665,33 @@ return size;
static t_stat sim_os_disk_unload_raw (FILE *f) static t_stat sim_os_disk_unload_raw (FILE *f)
{ {
#if defined(CDROM_GET_CAPABILITY) && defined(CDROMEJECT) && defined(CDROMEJECT_SW)
if (ioctl ((int)((long)f), CDROM_GET_CAPABILITY, NULL) < 0)
return SCPE_OK;
if (ioctl((int)((long)f), CDROM_LOCKDOOR, 0) < 0)
return SCPE_IOERR; return SCPE_IOERR;
if (ioctl((int)((long)f), CDROMEJECT) < 0)
return SCPE_IOERR;
#endif
return SCPE_OK;
} }
static t_bool sim_os_disk_isavailable_raw (FILE *Disk) static t_bool sim_os_disk_isavailable_raw (FILE *Disk)
{ {
#if defined(CDROMSTART) && defined(CDROM_GET_CAPABILITY)
if (ioctl ((int)((long)Disk), CDROM_GET_CAPABILITY, NULL) < 0)
return TRUE;
switch (ioctl((int)((long)Disk), CDROM_DRIVE_STATUS, CDSL_NONE)) {
case CDS_NO_INFO:
case CDS_NO_DISC:
case CDS_TRAY_OPEN:
case CDS_DRIVE_NOT_READY:
default: /* error */
return FALSE;
case CDS_DISC_OK:
return TRUE;
}
#endif
return TRUE; return TRUE;
} }
@ -2709,12 +2737,31 @@ return SCPE_OK;
static t_stat sim_os_disk_info_raw (FILE *f, uint32 *sector_size, uint32 *removable, uint32 *is_cdrom) static t_stat sim_os_disk_info_raw (FILE *f, uint32 *sector_size, uint32 *removable, uint32 *is_cdrom)
{ {
if (sector_size) if (sector_size) {
#if defined(BLKSSZGET)
if (ioctl ((int)((long)f), BLKSSZGET, sector_size) < 0)
#endif
*sector_size = 512; *sector_size = 512;
}
if (removable) if (removable)
*removable = 0; *removable = 0;
if (is_cdrom) if (is_cdrom) {
#if defined(CDROM_GET_CAPABILITY)
int cd_cap = ioctl ((int)((long)f), CDROM_GET_CAPABILITY, NULL);
if (cd_cap < 0)
*is_cdrom = 0; *is_cdrom = 0;
else {
*is_cdrom = 1;
if (removable)
*removable = 1;
if (sector_size)
*sector_size = 2048;
}
#else
*is_cdrom = 0;
#endif
}
return SCPE_OK; return SCPE_OK;
} }