From 63a57bb005d29e7ecdefde5f056105c653c76518 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 16 Nov 2011 15:34:24 +0000 Subject: [PATCH] Commented some sanity checks and dependency of MESS code (no whatsnew) --- src/emu/imagedev/flopdrv.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/emu/imagedev/flopdrv.c b/src/emu/imagedev/flopdrv.c index 87f220289fd..8cfa30174f0 100644 --- a/src/emu/imagedev/flopdrv.c +++ b/src/emu/imagedev/flopdrv.c @@ -117,13 +117,13 @@ static const floppy_error_map errmap[] = /*************************************************************************** IMPLEMENTATION ***************************************************************************/ -DECLARE_LEGACY_IMAGE_DEVICE(FLOPPY_APPLE, apple525); -DECLARE_LEGACY_IMAGE_DEVICE(FLOPPY_SONY, sonydriv); +//DECLARE_LEGACY_IMAGE_DEVICE(FLOPPY_APPLE, apple525); +//DECLARE_LEGACY_IMAGE_DEVICE(FLOPPY_SONY, sonydriv); INLINE floppy_drive *get_safe_token(device_t *device) { assert( device != NULL ); - assert( device->type() == LEGACY_FLOPPY || device->type() == FLOPPY_APPLE || device->type() == FLOPPY_SONY); + //assert( device->type() == LEGACY_FLOPPY || device->type() == FLOPPY_APPLE || device->type() == FLOPPY_SONY); return (floppy_drive *) downcast(device)->token(); } @@ -1002,9 +1002,7 @@ DEVICE_GET_INFO(floppy) case DEVINFO_FCT_IMAGE_UNLOAD: info->f = (genf *) DEVICE_IMAGE_UNLOAD_NAME(floppy); break; case DEVINFO_FCT_IMAGE_SOFTLIST_LOAD: info->f = (genf *) DEVICE_IMAGE_SOFTLIST_LOAD_NAME(floppy); break; case DEVINFO_FCT_IMAGE_DISPLAY_INFO: - if (device->type() == FLOPPY_APPLE) { - info->f = NULL; - } else { + if (device->type() == LEGACY_FLOPPY) { if ( device && downcast(device)->static_config() && ((floppy_interface*)(device)->static_config())->device_displayinfo) { info->f = (genf *) ((floppy_interface*)(device)->static_config())->device_displayinfo; } else {