From 3381ffa8912befa152696d7e718b45638d5a7961 Mon Sep 17 00:00:00 2001 From: waltje Date: Wed, 11 Oct 2017 05:56:45 -0400 Subject: [PATCH] Fix for moving cdrom_close() as well. --- src/cdrom/cdrom.h | 5 +++-- src/plat.h | 3 +-- src/win/win_cdrom.c | 19 ------------------- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/src/cdrom/cdrom.h b/src/cdrom/cdrom.h index 23f4f1df0..df9b03944 100644 --- a/src/cdrom/cdrom.h +++ b/src/cdrom/cdrom.h @@ -244,8 +244,9 @@ int cdrom_read_capacity(uint8_t id, uint8_t *cdb, uint8_t *buffer, uint32_t *len #define cdrom_ascq cdrom[id].sense[13] #define cdrom_drive cdrom_drives[id].host_drive -void cdrom_hard_reset(void); -void cdrom_general_init(void); +extern void cdrom_close(uint8_t id); +extern void cdrom_hard_reset(void); +extern void cdrom_general_init(void); #endif /*EMU_CDROM_H*/ diff --git a/src/plat.h b/src/plat.h index e49a29fe0..ca6ad5fbe 100644 --- a/src/plat.h +++ b/src/plat.h @@ -8,7 +8,7 @@ * * Define the various platform support functions. * - * Version: @(#)plat.h 1.0.3 2017/10/10 + * Version: @(#)plat.h 1.0.4 2017/10/10 * * Authors: Miran Grca, * Fred N. van Kempen, @@ -46,7 +46,6 @@ extern uint8_t host_cdrom_drive_available_num; extern uint32_t cdrom_capacity; extern void cdrom_init_host_drives(void); -extern void cdrom_close(uint8_t id); extern void cdrom_eject(uint8_t id); extern void cdrom_reload(uint8_t id); extern void removable_disk_unload(uint8_t id); diff --git a/src/win/win_cdrom.c b/src/win/win_cdrom.c index e42dec844..19e0f454e 100644 --- a/src/win/win_cdrom.c +++ b/src/win/win_cdrom.c @@ -64,25 +64,6 @@ cdrom_init_host_drives(void) } -void -cdrom_close(uint8_t id) -{ - switch (cdrom_drives[id].host_drive) { - case 0: - null_close(id); - break; - - case 200: - image_close(id); - break; - - default: - ioctl_close(id); - break; - } -} - - void cdrom_eject(uint8_t id) {