Applied all relevant PCem commits;
Extensively cleaned up and changed the CD-ROM code; Removed CD-ROM IOCTTL (it was causing performance and stability issues); Turned a lot of things into device_t's; Added the PS/1 Model 2011 XTA and standalone XTA hard disk controllers, ported from Varcem; Numerous FDC fixes for the PS/1 Model 2121; NVR changes ported from Varcem; The PCap code no longer requires libpcap to be compiled; Numerous fixes to various SCSI controllers; Updated NukedOPL to 1.8; Fixes to OpenAL initialization and closing, should give less Audio issues now; Revorked parts of the common (S)VGA code (also based on code from QEMU); Removed the Removable SCSI hard disks (they were a never finished experiment so there was no need to keep them there); Cleaned up the SCSI hard disk and Iomega ZIP code (but more cleanups of that are coming in the future); In some occasions (IDE hard disks in multiple sector mode and SCSI hard disks) the status bar icon is no longer updated, should improve performance a bit; Redid the way the tertiary and quaternary IDE controllers are configured (and they are now device_t's); Extensively reworked the IDE code and fixed quite a few bugs; Fixes to XT MFM, AT MFM, and AT ESDI code; Some changes to XTIDE and MCA ESDI code; Some fixes to the CD-ROM image handler.
This commit is contained in:
OBattler
@@ -9,7 +9,7 @@
|
||||
* Implementation of the CD-ROM drive with SCSI(-like)
|
||||
* commands, for both ATAPI and SCSI usage.
|
||||
*
|
||||
* Version: @(#)cdrom.h 1.0.10 2018/03/20
|
||||
* Version: @(#)cdrom.h 1.0.11 2018/03/26
|
||||
*
|
||||
* Author: Miran Grca, <mgrca8@gmail.com>
|
||||
*
|
||||
@@ -19,22 +19,22 @@
|
||||
#define EMU_CDROM_H
|
||||
|
||||
|
||||
#define CDROM_NUM 4
|
||||
#define CDROM_NUM 4
|
||||
|
||||
#define CD_STATUS_EMPTY 0
|
||||
#define CD_STATUS_DATA_ONLY 1
|
||||
#define CD_STATUS_PLAYING 2
|
||||
#define CD_STATUS_PAUSED 3
|
||||
#define CD_STATUS_STOPPED 4
|
||||
#define CD_STATUS_EMPTY 0
|
||||
#define CD_STATUS_DATA_ONLY 1
|
||||
#define CD_STATUS_PLAYING 2
|
||||
#define CD_STATUS_PAUSED 3
|
||||
#define CD_STATUS_STOPPED 4
|
||||
|
||||
#define CDROM_PHASE_IDLE 0
|
||||
#define CDROM_PHASE_COMMAND 1
|
||||
#define CDROM_PHASE_COMPLETE 2
|
||||
#define CDROM_PHASE_DATA_IN 3
|
||||
#define CDROM_PHASE_DATA_IN_DMA 4
|
||||
#define CDROM_PHASE_DATA_OUT 5
|
||||
#define CDROM_PHASE_DATA_OUT_DMA 6
|
||||
#define CDROM_PHASE_ERROR 0x80
|
||||
#define CDROM_PHASE_IDLE 0x00
|
||||
#define CDROM_PHASE_COMMAND 0x01
|
||||
#define CDROM_PHASE_COMPLETE 0x02
|
||||
#define CDROM_PHASE_DATA_IN 0x03
|
||||
#define CDROM_PHASE_DATA_IN_DMA 0x04
|
||||
#define CDROM_PHASE_DATA_OUT 0x05
|
||||
#define CDROM_PHASE_DATA_OUT_DMA 0x06
|
||||
#define CDROM_PHASE_ERROR 0x80
|
||||
|
||||
#define BUF_SIZE 32768
|
||||
|
||||
@@ -46,177 +46,106 @@
|
||||
|
||||
enum {
|
||||
CDROM_BUS_DISABLED = 0,
|
||||
CDROM_BUS_ATAPI_PIO_ONLY = 4,
|
||||
CDROM_BUS_ATAPI_PIO_AND_DMA,
|
||||
CDROM_BUS_ATAPI = 4,
|
||||
CDROM_BUS_SCSI,
|
||||
CDROM_BUS_USB = 8
|
||||
CDROM_BUS_USB
|
||||
};
|
||||
|
||||
|
||||
typedef struct {
|
||||
int (*ready)(uint8_t id);
|
||||
int (*medium_changed)(uint8_t id);
|
||||
int (*media_type_id)(uint8_t id);
|
||||
int (*ready)(uint8_t id);
|
||||
int (*medium_changed)(uint8_t id);
|
||||
int (*media_type_id)(uint8_t id);
|
||||
|
||||
void (*audio_callback)(uint8_t id, int16_t *output, int len);
|
||||
void (*audio_stop)(uint8_t id);
|
||||
int (*readtoc)(uint8_t id, uint8_t *b, uint8_t starttrack, int msf, int maxlen, int single);
|
||||
int (*readtoc_session)(uint8_t id, uint8_t *b, int msf, int maxlen);
|
||||
int (*readtoc_raw)(uint8_t id, uint8_t *b, int maxlen);
|
||||
uint8_t (*getcurrentsubchannel)(uint8_t id, uint8_t *b, int msf);
|
||||
int (*pass_through)(uint8_t id, uint8_t *in_cdb, uint8_t *b, uint32_t *len);
|
||||
int (*readsector_raw)(uint8_t id, uint8_t *buffer, int sector, int ismsf, int cdrom_sector_type, int cdrom_sector_flags, int *len);
|
||||
void (*playaudio)(uint8_t id, uint32_t pos, uint32_t len, int ismsf);
|
||||
void (*load)(uint8_t id);
|
||||
void (*eject)(uint8_t id);
|
||||
void (*pause)(uint8_t id);
|
||||
void (*resume)(uint8_t id);
|
||||
uint32_t (*size)(uint8_t id);
|
||||
int (*status)(uint8_t id);
|
||||
int (*is_track_audio)(uint8_t id, uint32_t pos, int ismsf);
|
||||
void (*stop)(uint8_t id);
|
||||
void (*exit)(uint8_t id);
|
||||
int (*audio_callback)(uint8_t id, int16_t *output, int len);
|
||||
void (*audio_stop)(uint8_t id);
|
||||
int (*readtoc)(uint8_t id, uint8_t *b, uint8_t starttrack, int msf, int maxlen, int single);
|
||||
int (*readtoc_session)(uint8_t id, uint8_t *b, int msf, int maxlen);
|
||||
int (*readtoc_raw)(uint8_t id, uint8_t *b, int maxlen);
|
||||
uint8_t (*getcurrentsubchannel)(uint8_t id, uint8_t *b, int msf);
|
||||
int (*readsector_raw)(uint8_t id, uint8_t *buffer, int sector, int ismsf, int cdrom_sector_type, int cdrom_sector_flags, int *len);
|
||||
uint8_t (*playaudio)(uint8_t id, uint32_t pos, uint32_t len, int ismsf);
|
||||
void (*pause)(uint8_t id);
|
||||
void (*resume)(uint8_t id);
|
||||
uint32_t (*size)(uint8_t id);
|
||||
int (*status)(uint8_t id);
|
||||
void (*stop)(uint8_t id);
|
||||
void (*exit)(uint8_t id);
|
||||
} CDROM;
|
||||
|
||||
typedef struct {
|
||||
uint8_t previous_command;
|
||||
int host_drive;
|
||||
int prev_host_drive;
|
||||
|
||||
int toctimes;
|
||||
int media_status;
|
||||
unsigned int bus_type; /* 0 = ATAPI, 1 = SCSI */
|
||||
|
||||
int is_dma;
|
||||
uint8_t speed, ide_channel,
|
||||
bus_mode; /* Bit 0 = PIO suported;
|
||||
Bit 1 = DMA supportd. */
|
||||
|
||||
int requested_blocks; /* This will be set to something other than 1 when block reads are implemented. */
|
||||
|
||||
uint64_t current_page_code;
|
||||
int current_page_len;
|
||||
|
||||
int current_page_pos;
|
||||
|
||||
int mode_select_phase;
|
||||
|
||||
int total_length;
|
||||
int written_length;
|
||||
|
||||
int do_page_save;
|
||||
|
||||
uint8_t error;
|
||||
uint8_t features;
|
||||
uint16_t request_length;
|
||||
uint16_t max_transfer_len;
|
||||
uint8_t status;
|
||||
uint8_t phase;
|
||||
|
||||
uint32_t sector_pos;
|
||||
uint32_t sector_len;
|
||||
|
||||
uint32_t packet_len;
|
||||
int packet_status;
|
||||
|
||||
uint8_t atapi_cdb[16];
|
||||
uint8_t current_cdb[16];
|
||||
|
||||
uint32_t pos;
|
||||
|
||||
int callback;
|
||||
|
||||
int data_pos;
|
||||
uint32_t seek_diff;
|
||||
|
||||
int cdb_len_setting;
|
||||
int cdb_len;
|
||||
|
||||
int cd_status;
|
||||
int prev_status;
|
||||
|
||||
int unit_attention;
|
||||
uint8_t sense[256];
|
||||
|
||||
int request_pos;
|
||||
|
||||
uint8_t *buffer;
|
||||
|
||||
int times;
|
||||
|
||||
uint32_t seek_pos;
|
||||
|
||||
int total_read;
|
||||
|
||||
int block_total;
|
||||
int all_blocks_total;
|
||||
|
||||
int old_len;
|
||||
int block_descriptor_len;
|
||||
|
||||
int init_length;
|
||||
|
||||
int16_t cd_buffer[BUF_SIZE];
|
||||
|
||||
uint8_t rcbuf[16];
|
||||
uint8_t sub_q_data_format[16];
|
||||
uint8_t sub_q_channel_data[256];
|
||||
int last_subchannel_pos;
|
||||
|
||||
uint32_t cd_end;
|
||||
uint32_t cdrom_capacity;
|
||||
|
||||
int cd_buflen;
|
||||
int cd_state;
|
||||
|
||||
int handler_inited;
|
||||
int disc_changed;
|
||||
|
||||
int cur_speed;
|
||||
} cdrom_t;
|
||||
|
||||
typedef struct {
|
||||
CDROM *handler;
|
||||
|
||||
int host_drive;
|
||||
int prev_host_drive;
|
||||
|
||||
unsigned int bus_type; /* 0 = ATAPI, 1 = SCSI */
|
||||
uint8_t bus_mode; /* Bit 0 = PIO suported;
|
||||
Bit 1 = DMA supportd. */
|
||||
|
||||
uint8_t ide_channel;
|
||||
|
||||
unsigned int scsi_device_id;
|
||||
unsigned int scsi_device_lun;
|
||||
|
||||
unsigned int sound_on;
|
||||
unsigned int atapi_dma;
|
||||
|
||||
uint8_t speed;
|
||||
unsigned int scsi_device_id, scsi_device_lun,
|
||||
sound_on;
|
||||
} cdrom_drive_t;
|
||||
|
||||
typedef struct {
|
||||
int image_is_iso;
|
||||
wchar_t image_path[1024];
|
||||
wchar_t *prev_image_path;
|
||||
FILE* image;
|
||||
} cdrom_image_t;
|
||||
mode_sense_pages_t ms_pages_saved;
|
||||
|
||||
CDROM *handler;
|
||||
cdrom_drive_t *drv;
|
||||
|
||||
uint8_t previous_command,
|
||||
error, features,
|
||||
status, phase,
|
||||
id, *buffer,
|
||||
atapi_cdb[16],
|
||||
current_cdb[16],
|
||||
sense[256];
|
||||
|
||||
uint16_t request_length, max_transfer_len;
|
||||
int16_t cd_buffer[BUF_SIZE];
|
||||
|
||||
int media_status, is_dma,
|
||||
packet_status, requested_blocks,
|
||||
current_page_len, current_page_pos,
|
||||
mode_select_phase, do_page_save,
|
||||
total_length, written_length,
|
||||
callback, data_pos,
|
||||
cd_status, prev_status,
|
||||
unit_attention, request_pos,
|
||||
total_read, cur_speed,
|
||||
block_total, all_blocks_total,
|
||||
old_len, block_descriptor_len,
|
||||
init_length, last_subchannel_pos,
|
||||
cd_buflen, cd_state,
|
||||
handler_inited, disc_changed;
|
||||
|
||||
uint32_t sector_pos, sector_len,
|
||||
seek_pos, seek_diff,
|
||||
pos, packet_len,
|
||||
cdb_len, cd_end,
|
||||
cdrom_capacity;
|
||||
|
||||
uint64_t current_page_code;
|
||||
} cdrom_t;
|
||||
|
||||
typedef struct {
|
||||
char ioctl_path[8];
|
||||
int actual_requested_blocks;
|
||||
int last_track_pos;
|
||||
int last_track_nr;
|
||||
int capacity_read;
|
||||
} cdrom_ioctl_t;
|
||||
int image_is_iso;
|
||||
wchar_t image_path[1024],
|
||||
*prev_image_path;
|
||||
FILE* image;
|
||||
} cdrom_image_t;
|
||||
|
||||
|
||||
extern cdrom_t *cdrom[CDROM_NUM];
|
||||
extern cdrom_drive_t cdrom_drives[CDROM_NUM];
|
||||
extern cdrom_image_t cdrom_image[CDROM_NUM];
|
||||
extern cdrom_ioctl_t cdrom_ioctl[CDROM_NUM];
|
||||
extern uint8_t atapi_cdrom_drives[8];
|
||||
extern uint8_t scsi_cdrom_drives[16][8];
|
||||
|
||||
#define cdrom_sense_error cdrom[id]->sense[0]
|
||||
#define cdrom_sense_key cdrom[id]->sense[2]
|
||||
#define cdrom_asc cdrom[id]->sense[12]
|
||||
#define cdrom_ascq cdrom[id]->sense[13]
|
||||
#define cdrom_sense_error dev->sense[0]
|
||||
#define cdrom_sense_key dev->sense[2]
|
||||
#define cdrom_asc dev->sense[12]
|
||||
#define cdrom_ascq dev->sense[13]
|
||||
#define cdrom_drive cdrom_drives[id].host_drive
|
||||
|
||||
|
||||
@@ -224,35 +153,34 @@ extern uint8_t scsi_cdrom_drives[16][8];
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern int (*ide_bus_master_read)(int channel, uint8_t *data, int transfer_length);
|
||||
extern int (*ide_bus_master_write)(int channel, uint8_t *data, int transfer_length);
|
||||
extern void (*ide_bus_master_set_irq)(int channel);
|
||||
extern void ioctl_close(uint8_t id);
|
||||
extern int (*ide_bus_master_read)(int channel, uint8_t *data, int transfer_length, void *priv);
|
||||
extern int (*ide_bus_master_write)(int channel, uint8_t *data, int transfer_length, void *priv);
|
||||
extern void (*ide_bus_master_set_irq)(int channel, void *priv);
|
||||
extern void *ide_bus_master_priv[2];
|
||||
|
||||
extern uint32_t cdrom_mode_sense_get_channel(uint8_t id, int channel);
|
||||
extern uint32_t cdrom_mode_sense_get_volume(uint8_t id, int channel);
|
||||
extern uint32_t cdrom_mode_sense_get_channel(cdrom_t *dev, int channel);
|
||||
extern uint32_t cdrom_mode_sense_get_volume(cdrom_t *dev, int channel);
|
||||
extern void build_atapi_cdrom_map(void);
|
||||
extern void build_scsi_cdrom_map(void);
|
||||
extern int cdrom_CDROM_PHASE_to_scsi(uint8_t id);
|
||||
extern int cdrom_atapi_phase_to_scsi(uint8_t id);
|
||||
extern void cdrom_command(uint8_t id, uint8_t *cdb);
|
||||
extern void cdrom_phase_callback(uint8_t id);
|
||||
extern int cdrom_CDROM_PHASE_to_scsi(cdrom_t *dev);
|
||||
extern int cdrom_atapi_phase_to_scsi(cdrom_t *dev);
|
||||
extern void cdrom_command(cdrom_t *dev, uint8_t *cdb);
|
||||
extern void cdrom_phase_callback(cdrom_t *dev);
|
||||
extern uint32_t cdrom_read(uint8_t channel, int length);
|
||||
extern void cdrom_write(uint8_t channel, uint32_t val, int length);
|
||||
|
||||
extern int cdrom_lba_to_msf_accurate(int lba);
|
||||
extern void cdrom_destroy_drives(void);
|
||||
|
||||
extern void cdrom_close(uint8_t id);
|
||||
extern void cdrom_reset(uint8_t id);
|
||||
extern void cdrom_set_signature(int id);
|
||||
extern void cdrom_request_sense_for_scsi(uint8_t id, uint8_t *buffer, uint8_t alloc_length);
|
||||
extern void cdrom_close_handler(uint8_t id);
|
||||
extern void cdrom_close(void);
|
||||
extern void cdrom_reset(cdrom_t *dev);
|
||||
extern void cdrom_set_signature(cdrom_t *dev);
|
||||
extern void cdrom_request_sense_for_scsi(cdrom_t *dev, uint8_t *buffer, uint8_t alloc_length);
|
||||
extern void cdrom_update_cdb(uint8_t *cdb, int lba_pos, int number_of_blocks);
|
||||
extern void cdrom_insert(uint8_t id);
|
||||
extern void cdrom_new_image(uint8_t id);
|
||||
extern void cdrom_insert(cdrom_t *dev);
|
||||
|
||||
extern int find_cdrom_for_scsi_id(uint8_t scsi_id, uint8_t scsi_lun);
|
||||
extern int cdrom_read_capacity(uint8_t id, uint8_t *cdb, uint8_t *buffer, uint32_t *len);
|
||||
extern int cdrom_read_capacity(cdrom_t *dev, uint8_t *cdb, uint8_t *buffer, uint32_t *len);
|
||||
|
||||
extern void cdrom_global_init(void);
|
||||
extern void cdrom_global_reset(void);
|
||||
|
||||
Reference in New Issue
Block a user