claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IOCTL and CD-ROM changes.

Browse Source
This commit is contained in:
OBattler
2024-05-19 21:17:57 +02:00
parent 9af55412db
commit 641da43f15
13 changed files with 424 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cdrom/cdrom.c
View File

@@ -1971,9 +1971,11 @@ cdrom_hard_reset(void)
dev->image_path[strlen(dev->image_path) - 1] = '/'; dev->image_path[strlen(dev->image_path) - 1] = '/';
#endif #endif
cdrom_image_open(dev, dev->image_path); if ((strlen(dev->image_path) != 0) && (strstr(dev->image_path, "ioctl://") == dev->image_path))
} else if (dev->host_drive == 201) cdrom_ioctl_open(dev, dev->image_path);
cdrom_ioctl_open(dev, dev->drive); else
cdrom_image_open(dev, dev->image_path);
}
} }
} }
@@ -2026,10 +2028,8 @@ cdrom_eject(uint8_t id)
return; return;
} }
if (dev->host_drive == 200) if (dev->host_drive >= 200)
strcpy(dev->prev_image_path, dev->image_path); strcpy(dev->prev_image_path, dev->image_path);
else if (dev->host_drive == 201)
cdrom_ioctl_eject();
dev->prev_host_drive = dev->host_drive + (dev->host ? 1 : 0); dev->prev_host_drive = dev->host_drive + (dev->host ? 1 : 0);
dev->host_drive = 0; dev->host_drive = 0;
@@ -2078,17 +2078,17 @@ cdrom_reload(uint8_t id)
} }
#endif #endif
if (dev->prev_host_drive > 200) if ((strlen(dev->image_path) != 0) && (strstr(dev->image_path, "ioctl://") == dev->image_path))
cdrom_ioctl_open(dev, dev->drive); cdrom_ioctl_open(dev, dev->image_path);
else else
cdrom_image_open(dev, dev->image_path); cdrom_image_open(dev, dev->image_path);
cdrom_insert(id); cdrom_insert(id);
if ((strlen(dev->image_path) == 0) && !dev->drive) if (strlen(dev->image_path) == 0)
dev->host_drive = 0; dev->host_drive = 0;
else else
dev->host_drive = 200 + (dev->host ? 1 : 0); dev->host_drive = 200;
} }
plat_cdrom_ui_update(id, 1); plat_cdrom_ui_update(id, 1);

7
src/cdrom/cdrom_image.c
View File

@@ -217,6 +217,12 @@ image_track_type(cdrom_t *dev, uint32_t lba)
return 0; return 0;
} }
static int
image_ext_medium_changed(cdrom_t *dev)
{
return 0;
}
static void static void
image_exit(cdrom_t *dev) image_exit(cdrom_t *dev)
{ {
@@ -241,6 +247,7 @@ static const cdrom_ops_t cdrom_image_ops = {
image_sector_size, image_sector_size,
image_read_sector, image_read_sector,
image_track_type, image_track_type,
image_ext_medium_changed,
image_exit image_exit
}; };

135
src/cdrom/cdrom_ioctl.c
View File

@@ -56,7 +56,7 @@ cdrom_ioctl_log(const char *fmt, ...)
#define MSFtoLBA(m, s, f) ((((m * 60) + s) * 75) + f) #define MSFtoLBA(m, s, f) ((((m * 60) + s) * 75) + f)
static void static void
cdrom_ioctl_get_tracks(UNUSED(cdrom_t *dev), int *first, int *last) ioctl_get_tracks(UNUSED(cdrom_t *dev), int *first, int *last)
{ {
TMSF tmsf; TMSF tmsf;
@@ -64,7 +64,7 @@ cdrom_ioctl_get_tracks(UNUSED(cdrom_t *dev), int *first, int *last)
} }
static void static void
cdrom_ioctl_get_track_info(UNUSED(cdrom_t *dev), uint32_t track, int end, track_info_t *ti) ioctl_get_track_info(UNUSED(cdrom_t *dev), uint32_t track, int end, track_info_t *ti)
{ {
TMSF tmsf; TMSF tmsf;
@@ -76,13 +76,30 @@ cdrom_ioctl_get_track_info(UNUSED(cdrom_t *dev), uint32_t track, int end, track_
} }
static void static void
cdrom_ioctl_get_subchannel(UNUSED(cdrom_t *dev), uint32_t lba, subchannel_t *subc) ioctl_get_subchannel(UNUSED(cdrom_t *dev), uint32_t lba, subchannel_t *subc)
{ {
TMSF rel_pos; TMSF rel_pos;
TMSF abs_pos; TMSF abs_pos;
plat_cdrom_get_audio_sub(lba, &subc->attr, &subc->track, &subc->index, if ((dev->cd_status == CD_STATUS_PLAYING) || (dev->cd_status == CD_STATUS_PAUSED)) {
&rel_pos, &abs_pos); uint32_t dat = lba + 150;
abs_pos.fr = dat % 75;
dat /= 75;
abs_pos.sec = dat % 60;
dat /= 60;
abs_pos.min = dat;
dat = lba - plat_cdrom_get_track_start(lba, &subc->attr, &subc->track);
rel_pos.fr = dat % 75;
dat /= 75;
rel_pos.sec = dat % 60;
dat /= 60;
rel_pos.min = dat;
subc->index = 1;
} else
plat_cdrom_get_audio_sub(lba, &subc->attr, &subc->track, &subc->index,
&rel_pos, &abs_pos);
subc->abs_m = abs_pos.min; subc->abs_m = abs_pos.min;
subc->abs_s = abs_pos.sec; subc->abs_s = abs_pos.sec;
@@ -91,6 +108,9 @@ cdrom_ioctl_get_subchannel(UNUSED(cdrom_t *dev), uint32_t lba, subchannel_t *sub
subc->rel_m = rel_pos.min; subc->rel_m = rel_pos.min;
subc->rel_s = rel_pos.sec; subc->rel_s = rel_pos.sec;
subc->rel_f = rel_pos.fr; subc->rel_f = rel_pos.fr;
cdrom_ioctl_log("ioctl_get_subchannel(): %02i, %02X, %02i, %02i:%02i:%02i, %02i:%02i:%02i\n",
subc->attr, subc->track, subc->index, subc->abs_m, subc->abs_s, subc->abs_f, subc->rel_m, subc->rel_s, subc->rel_f);
} }
static int static int
@@ -99,20 +119,16 @@ cdrom_ioctl_get_capacity(UNUSED(cdrom_t *dev))
int ret; int ret;
ret = plat_cdrom_get_last_block(); ret = plat_cdrom_get_last_block();
pclog("GetCapacity=%x.\n", ret); cdrom_ioctl_log("GetCapacity=%x.\n", ret);
return ret; return ret;
} }
static int static int
cdrom_ioctl_is_track_audio(cdrom_t *dev, uint32_t pos, int ismsf) ioctl_is_track_audio(cdrom_t *dev, uint32_t pos, int ismsf)
{ {
uint8_t attr;
TMSF tmsf;
int m; int m;
int s; int s;
int f; int f;
int number;
int track;
if (dev->cd_status == CD_STATUS_DATA_ONLY) if (dev->cd_status == CD_STATUS_DATA_ONLY)
return 0; return 0;
@@ -129,27 +145,30 @@ cdrom_ioctl_is_track_audio(cdrom_t *dev, uint32_t pos, int ismsf)
} }
static int static int
cdrom_ioctl_is_track_pre(UNUSED(cdrom_t *dev), UNUSED(uint32_t lba)) ioctl_is_track_pre(UNUSED(cdrom_t *dev), UNUSED(uint32_t lba))
{ {
return 0; return 0;
} }
static int static int
cdrom_ioctl_sector_size(UNUSED(cdrom_t *dev), uint32_t lba) ioctl_sector_size(UNUSED(cdrom_t *dev), uint32_t lba)
{ {
pclog("LBA=%x.\n", lba); cdrom_ioctl_log("LBA=%x.\n", lba);
return plat_cdrom_get_sector_size(lba); return plat_cdrom_get_sector_size(lba);
} }
static int static int
cdrom_ioctl_read_sector(UNUSED(cdrom_t *dev), int type, uint8_t *b, uint32_t lba) ioctl_read_sector(UNUSED(cdrom_t *dev), int type, uint8_t *b, uint32_t lba)
{ {
switch (type) { switch (type) {
case CD_READ_DATA: case CD_READ_DATA:
cdrom_ioctl_log("cdrom_ioctl_read_sector(): Data.\n");
return plat_cdrom_read_sector(b, 0, lba); return plat_cdrom_read_sector(b, 0, lba);
case CD_READ_AUDIO: case CD_READ_AUDIO:
cdrom_ioctl_log("cdrom_ioctl_read_sector(): Audio.\n");
return plat_cdrom_read_sector(b, 1, lba); return plat_cdrom_read_sector(b, 1, lba);
case CD_READ_RAW: case CD_READ_RAW:
cdrom_ioctl_log("cdrom_ioctl_read_sector(): Raw.\n");
return plat_cdrom_read_sector(b, 1, lba); return plat_cdrom_read_sector(b, 1, lba);
default: default:
cdrom_ioctl_log("cdrom_ioctl_read_sector(): Unknown CD read type.\n"); cdrom_ioctl_log("cdrom_ioctl_read_sector(): Unknown CD read type.\n");
@@ -159,16 +178,34 @@ cdrom_ioctl_read_sector(UNUSED(cdrom_t *dev), int type, uint8_t *b, uint32_t lba
} }
static int static int
cdrom_ioctl_track_type(cdrom_t *dev, uint32_t lba) ioctl_track_type(cdrom_t *dev, uint32_t lba)
{ {
if (cdrom_ioctl_is_track_audio(dev, lba, 0)) int ret = 0;
return CD_TRACK_AUDIO;
return 0; if (ioctl_is_track_audio(dev, lba, 0))
ret = CD_TRACK_AUDIO;
cdrom_ioctl_log("cdrom_ioctl_track_type(): %i\n", ret);
return ret;
}
static int
ioctl_ext_medium_changed(cdrom_t *dev)
{
const int ret = plat_cdrom_ext_medium_changed();
if (ret == 1) {
dev->cd_status = CD_STATUS_STOPPED;
dev->cdrom_capacity = cdrom_ioctl_get_capacity(dev);
} else if (ret == -1)
dev->cd_status = CD_STATUS_EMPTY;
return ret;
} }
static void static void
cdrom_ioctl_exit(cdrom_t *dev) ioctl_exit(cdrom_t *dev)
{ {
cdrom_ioctl_log("CDROM: ioctl_exit(%s)\n", dev->image_path); cdrom_ioctl_log("CDROM: ioctl_exit(%s)\n", dev->image_path);
dev->cd_status = CD_STATUS_EMPTY; dev->cd_status = CD_STATUS_EMPTY;
@@ -179,25 +216,17 @@ cdrom_ioctl_exit(cdrom_t *dev)
} }
static const cdrom_ops_t cdrom_ioctl_ops = { static const cdrom_ops_t cdrom_ioctl_ops = {
cdrom_ioctl_get_tracks, ioctl_get_tracks,
cdrom_ioctl_get_track_info, ioctl_get_track_info,
cdrom_ioctl_get_subchannel, ioctl_get_subchannel,
cdrom_ioctl_is_track_pre, ioctl_is_track_pre,
cdrom_ioctl_sector_size, ioctl_sector_size,
cdrom_ioctl_read_sector, ioctl_read_sector,
cdrom_ioctl_track_type, ioctl_track_type,
cdrom_ioctl_exit ioctl_ext_medium_changed,
ioctl_exit
}; };
void
cdrom_ioctl_close(cdrom_t *dev)
{
cdrom_ioctl_log("CDROM: ioctl_close(%s)\n", dev->image_path);
if (dev && dev->ops && dev->ops->exit)
dev->ops->exit(dev);
}
static int static int
cdrom_ioctl_open_abort(cdrom_t *dev) cdrom_ioctl_open_abort(cdrom_t *dev)
{ {
@@ -208,17 +237,21 @@ cdrom_ioctl_open_abort(cdrom_t *dev)
return 1; return 1;
} }
void
cdrom_ioctl_eject(void)
{
plat_cdrom_eject();
}
int int
cdrom_ioctl_open(cdrom_t *dev, int drive) cdrom_ioctl_open(cdrom_t *dev, const char *drv)
{ {
const char *actual_drv = &(drv[8]);
/* Make sure to not STRCPY if the two are pointing
at the same place. */
if (drv != dev->image_path)
strcpy(dev->image_path, drv);
/* Open the image. */ /* Open the image. */
int i = plat_cdrom_set_drive(drive); if (strstr(drv, "ioctl://") != drv)
return cdrom_ioctl_open_abort(dev);
cdrom_ioctl_log("actual_drv = %s\n", actual_drv);
int i = plat_cdrom_set_drive(actual_drv);
if (!i) if (!i)
return cdrom_ioctl_open_abort(dev); return cdrom_ioctl_open_abort(dev);
@@ -228,7 +261,8 @@ cdrom_ioctl_open(cdrom_t *dev, int drive)
dev->seek_pos = 0; dev->seek_pos = 0;
dev->cd_buflen = 0; dev->cd_buflen = 0;
dev->cdrom_capacity = cdrom_ioctl_get_capacity(dev); dev->cdrom_capacity = cdrom_ioctl_get_capacity(dev);
pclog("CD-ROM capacity: %i sectors (%" PRIi64 " bytes)\n", dev->cdrom_capacity, ((uint64_t) dev->cdrom_capacity) << 11ULL); cdrom_ioctl_log("CD-ROM capacity: %i sectors (%" PRIi64 " bytes)\n",
dev->cdrom_capacity, ((uint64_t) dev->cdrom_capacity) << 11ULL);
/* Attach this handler to the drive. */ /* Attach this handler to the drive. */
dev->ops = &cdrom_ioctl_ops; dev->ops = &cdrom_ioctl_ops;
@@ -236,3 +270,12 @@ cdrom_ioctl_open(cdrom_t *dev, int drive)
return 0; return 0;
} }
void
cdrom_ioctl_close(cdrom_t *dev)
{
cdrom_ioctl_log("CDROM: ioctl_close(%s)\n", dev->image_path);
if (dev && dev->ops && dev->ops->exit)
dev->ops->exit(dev);
}

16
src/include/86box/cdrom.h
View File

@@ -199,10 +199,11 @@ typedef struct cdrom_ops_t {
void (*get_tracks)(struct cdrom *dev, int *first, int *last); void (*get_tracks)(struct cdrom *dev, int *first, int *last);
void (*get_track_info)(struct cdrom *dev, uint32_t track, int end, track_info_t *ti); void (*get_track_info)(struct cdrom *dev, uint32_t track, int end, track_info_t *ti);
void (*get_subchannel)(struct cdrom *dev, uint32_t lba, subchannel_t *subc); void (*get_subchannel)(struct cdrom *dev, uint32_t lba, subchannel_t *subc);
int (*is_track_pre)(struct cdrom *dev, uint32_t lba); int (*is_track_pre)(struct cdrom *dev, uint32_t lba);
int (*sector_size)(struct cdrom *dev, uint32_t lba); int (*sector_size)(struct cdrom *dev, uint32_t lba);
int (*read_sector)(struct cdrom *dev, int type, uint8_t *b, uint32_t lba); int (*read_sector)(struct cdrom *dev, int type, uint8_t *b, uint32_t lba);
int (*track_type)(struct cdrom *dev, uint32_t lba); int (*track_type)(struct cdrom *dev, uint32_t lba);
int (*ext_medium_changed)(struct cdrom *dev);
void (*exit)(struct cdrom *dev); void (*exit)(struct cdrom *dev);
} cdrom_ops_t; } cdrom_ops_t;
@@ -247,7 +248,6 @@ typedef struct cdrom {
int audio_muted_soft; int audio_muted_soft;
int sony_msf; int sony_msf;
int host; int host;
int drive;
const cdrom_ops_t *ops; const cdrom_ops_t *ops;
@@ -307,11 +307,9 @@ extern void cdrom_reload(uint8_t id);
extern int cdrom_image_open(cdrom_t *dev, const char *fn); extern int cdrom_image_open(cdrom_t *dev, const char *fn);
extern void cdrom_image_close(cdrom_t *dev); extern void cdrom_image_close(cdrom_t *dev);
extern void cdrom_image_reset(cdrom_t *dev);
extern void cdrom_ioctl_eject(void); extern int cdrom_ioctl_open(cdrom_t *dev, const char *drv);
extern void cdrom_ioctl_load(void); extern void cdrom_ioctl_close(cdrom_t *dev);
extern int cdrom_ioctl_open(cdrom_t *dev, int drive);
extern void cdrom_update_cdb(uint8_t *cdb, int lba_pos, extern void cdrom_update_cdb(uint8_t *cdb, int lba_pos,
int number_of_blocks); int number_of_blocks);

21
src/include/86box/plat_cdrom.h
View File

@@ -49,15 +49,18 @@ typedef struct SMSF {
uint8_t fr; uint8_t fr;
} TMSF; } TMSF;
extern int plat_cdrom_is_track_audio(uint32_t sector); extern int plat_cdrom_is_track_audio(uint32_t sector);
extern int plat_cdrom_get_last_block(void); extern uint32_t plat_cdrom_get_last_block(void);
extern void plat_cdrom_get_audio_tracks(int *st_track, int *end, TMSF *lead_out); extern void plat_cdrom_get_audio_tracks(int *st_track, int *end, TMSF *lead_out);
extern int plat_cdrom_get_audio_track_info(int end, int track, int *track_num, TMSF *start, uint8_t *attr); extern int plat_cdrom_get_audio_track_info(int end, int track, int *track_num, TMSF *start, uint8_t *attr);
extern int plat_cdrom_get_audio_sub(uint32_t sector, uint8_t *attr, uint8_t *track, uint8_t *index, TMSF *rel_pos, TMSF *abs_pos); extern int plat_cdrom_get_audio_sub(uint32_t sector, uint8_t *attr, uint8_t *track, uint8_t *index, TMSF *rel_pos, TMSF *abs_pos);
extern int plat_cdrom_get_sector_size(uint32_t sector); extern int plat_cdrom_get_sector_size(uint32_t sector);
extern int plat_cdrom_read_sector(uint8_t *buffer, int raw, uint32_t sector); extern int plat_cdrom_read_sector(uint8_t *buffer, int raw, uint32_t sector);
extern void plat_cdrom_close(void); extern void plat_cdrom_eject(void);
extern int plat_cdrom_set_drive(int drive); extern void plat_cdrom_close(void);
extern int plat_cdrom_set_drive(const char *drv);
extern int plat_cdrom_ext_medium_changed(void);
extern uint32_t plat_cdrom_get_track_start(uint32_t sector, uint8_t *attr, uint8_t *track);
#ifdef __cplusplus #ifdef __cplusplus
} }

4
src/qt/CMakeLists.txt
View File

@@ -225,6 +225,10 @@ else()
target_sources(plat PRIVATE ../unix/unix_serial_passthrough.c ../unix/unix_netsocket.c) target_sources(plat PRIVATE ../unix/unix_serial_passthrough.c ../unix/unix_netsocket.c)
endif() endif()
if(WIN32)
target_sources(plat PRIVATE win_cdrom_ioctl.c)
endif()
if (APPLE) if (APPLE)
target_sources(ui PRIVATE macos_event_filter.mm) target_sources(ui PRIVATE macos_event_filter.mm)
if(MOLTENVK) if(MOLTENVK)

2
src/qt/qt_machinestatus.cpp
View File

@@ -533,7 +533,7 @@ MachineStatus::refresh(QStatusBar *sbar)
iterateCDROM([this, sbar](int i) { iterateCDROM([this, sbar](int i) {
d->cdrom[i].label = std::make_unique<ClickableLabel>(); d->cdrom[i].label = std::make_unique<ClickableLabel>();
d->cdrom[i].setEmpty(((cdrom[i].host_drive != 200) && (cdrom[i].host_drive != 201)) || QString(cdrom[i].image_path).isEmpty()); d->cdrom[i].setEmpty((cdrom[i].host_drive != 200) || QString(cdrom[i].image_path).isEmpty());
d->cdrom[i].setActive(false); d->cdrom[i].setActive(false);
d->cdrom[i].refresh(); d->cdrom[i].refresh();
connect((ClickableLabel *) d->cdrom[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) { connect((ClickableLabel *) d->cdrom[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) {

2
src/qt/qt_mediahistorymanager.cpp
View File

@@ -306,7 +306,7 @@ MediaHistoryManager::removeMissingImages(device_index_list_t &device_history)
} }
// For this check, explicitly prepend `usr_path` to relative paths to account for $CWD platform variances // For this check, explicitly prepend `usr_path` to relative paths to account for $CWD platform variances
QFileInfo absolute_path = file_info.isRelative() ? QFileInfo(getUsrPath().append(file_info.filePath())) : file_info; QFileInfo absolute_path = file_info.isRelative() ? QFileInfo(getUsrPath().append(file_info.filePath())) : file_info;
if (!absolute_path.exists()) { if ((file_info.filePath().left(8) != "ioctl://") && !absolute_path.exists()) {
qWarning("Image file %s does not exist - removing from history", qPrintable(file_info.filePath())); qWarning("Image file %s does not exist - removing from history", qPrintable(file_info.filePath()));
checked_path = ""; checked_path = "";
} }

116
src/qt/qt_mediamenu.cpp
View File

@@ -146,8 +146,8 @@ MediaMenu::refresh(QMenu *parentMenu)
cdromMutePos = menu->children().count(); cdromMutePos = menu->children().count();
menu->addAction(QApplication::style()->standardIcon(QStyle::SP_MediaVolumeMuted), tr("&Mute"), [this, i]() { cdromMute(i); })->setCheckable(true); menu->addAction(QApplication::style()->standardIcon(QStyle::SP_MediaVolumeMuted), tr("&Mute"), [this, i]() { cdromMute(i); })->setCheckable(true);
menu->addSeparator(); menu->addSeparator();
menu->addAction(ProgSettings::loadIcon("/cdrom.ico"), tr("&Image..."), [this, i]() { cdrom[i].host = 0; cdrom[i].drive = 0; cdromMount(i, 0); })->setCheckable(false); menu->addAction(ProgSettings::loadIcon("/cdrom.ico"), tr("&Image..."), [this, i]() { cdromMount(i, 0, nullptr); })->setCheckable(false);
menu->addAction(QApplication::style()->standardIcon(QStyle::SP_DirIcon), tr("&Folder..."), [this, i]() { cdrom[i].host = 0; cdrom[i].drive = 0; cdromMount(i, 1); })->setCheckable(false); menu->addAction(QApplication::style()->standardIcon(QStyle::SP_DirIcon), tr("&Folder..."), [this, i]() { cdromMount(i, 1, nullptr); })->setCheckable(false);
menu->addSeparator(); menu->addSeparator();
for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) { for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
cdromImageHistoryPos[slot] = menu->children().count(); cdromImageHistoryPos[slot] = menu->children().count();
@@ -159,12 +159,11 @@ MediaMenu::refresh(QMenu *parentMenu)
it's a CDROM */ it's a CDROM */
for (auto &letter : driveLetters) { for (auto &letter : driveLetters) {
auto drive = QString::asprintf("%c:\\", letter).toUtf8().constData(); auto drive = QString::asprintf("%c:\\", letter).toUtf8().constData();
if (GetDriveType(drive) == DRIVE_CDROM) { if (GetDriveType(drive) == DRIVE_CDROM)
menu->addAction(ProgSettings::loadIcon("/cdrom.ico"), tr("Host CD/DVD Drive (%1:)").arg(letter), [this, i, letter]() { cdrom[i].host = 1; cdrom[i].drive = letter; cdromMount(i, 0); })->setCheckable(false); menu->addAction(QApplication::style()->standardIcon(QStyle::SP_DriveCDIcon), tr("Host CD/DVD Drive (%1:)").arg(letter), [this, i, letter]() { cdromMount(i, 2, QString::asprintf(R"(\\.\%c:)", letter).toUtf8().constData()); })->setCheckable(false);
}
} }
menu->addSeparator(); menu->addSeparator();
#endif // _WIN32 #endif // Q_OS_WINDOWS
cdromImagePos = menu->children().count(); cdromImagePos = menu->children().count();
cdromDirPos = menu->children().count(); cdromDirPos = menu->children().count();
menu->addAction(tr("E&ject"), [this, i]() { cdromEject(i); })->setCheckable(false); menu->addAction(tr("E&ject"), [this, i]() { cdromEject(i); })->setCheckable(false);
@@ -486,30 +485,27 @@ MediaMenu::cdromMount(int i, const QString &filename)
cdrom[i].ops = nullptr; cdrom[i].ops = nullptr;
memset(cdrom[i].image_path, 0, sizeof(cdrom[i].image_path)); memset(cdrom[i].image_path, 0, sizeof(cdrom[i].image_path));
#ifdef _WIN32 #ifdef Q_OS_WINDOWS
if (!cdrom[i].host && (fn.data() != NULL) && (strlen(fn.data()) >= 1) && (fn.data()[strlen(fn.data()) - 1] == '/')) if (!cdrom[i].host && (fn.data() != nullptr) && (strlen(fn.data()) >= 1) && (fn.data()[strlen(fn.data()) - 1] == '/'))
fn.data()[strlen(fn.data()) - 1] = '\\'; fn.data()[strlen(fn.data()) - 1] = '\\';
#else #else
if ((fn.data() != NULL) && (strlen(fn.data()) >= 1) && (fn.data()[strlen(fn.data()) - 1] == '\\')) if ((fn.data() != NULL) && (strlen(fn.data()) >= 1) && (fn.data()[strlen(fn.data()) - 1] == '\\'))
fn.data()[strlen(fn.data()) - 1] = '/'; fn.data()[strlen(fn.data()) - 1] = '/';
#endif #endif
if (cdrom[i].host) if ((fn.data() != nullptr) && fn.contains("ioctl://"))
cdrom_ioctl_open(&(cdrom[i]), cdrom[i].drive); cdrom_ioctl_open(&(cdrom[i]), fn.data());
else else
cdrom_image_open(&(cdrom[i]), fn.data()); cdrom_image_open(&(cdrom[i]), fn.data());
/* Signal media change to the emulated machine. */ /* Signal media change to the emulated machine. */
if (cdrom[i].insert) if (cdrom[i].insert)
cdrom[i].insert(cdrom[i].priv); cdrom[i].insert(cdrom[i].priv);
cdrom[i].host_drive = (strlen(cdrom[i].image_path) == 0 && !cdrom[i].drive) ? 0 : (200 + (cdrom[i].host ? 1 : 0)); cdrom[i].host_drive = (strlen(cdrom[i].image_path) == 0) ? 0 : 200;
pclog("HostDrive=%d, drive=%d.\n", cdrom[i].host_drive, cdrom[i].drive); if (cdrom[i].host_drive >= 200)
if (cdrom[i].host_drive >= 200) {
ui_sb_update_icon_state(SB_CDROM | i, 0); ui_sb_update_icon_state(SB_CDROM | i, 0);
} else { else
ui_sb_update_icon_state(SB_CDROM | i, 1); ui_sb_update_icon_state(SB_CDROM | i, 1);
} mhm.addImageToHistory(i, ui::MediaType::Optical, cdrom[i].prev_image_path, cdrom[i].image_path);
if (!cdrom[i].host)
mhm.addImageToHistory(i, ui::MediaType::Optical, cdrom[i].prev_image_path, cdrom[i].image_path);
cdromUpdateMenu(i); cdromUpdateMenu(i);
ui_sb_update_tip(SB_CDROM | i); ui_sb_update_tip(SB_CDROM | i);
@@ -517,31 +513,23 @@ MediaMenu::cdromMount(int i, const QString &filename)
} }
void void
MediaMenu::cdromMount(int i, int dir) MediaMenu::cdromMount(int i, int dir, const QString &arg)
{ {
QString filename; QString filename;
QFileInfo fi(cdrom[i].image_path); QFileInfo fi(cdrom[i].image_path);
pclog("IsHost?=%d.\n", cdrom[i].host); if (dir > 1)
if (cdrom[i].host) { filename = QString::asprintf(R"(ioctl://%s)", arg.toStdString().c_str());
filename = QString(cdrom[i].drive); else if (dir == 1)
} else { filename = QFileDialog::getExistingDirectory(parentWidget);
if (dir) { else {
filename = QFileDialog::getExistingDirectory( filename = QFileDialog::getOpenFileName(parentWidget, QString(),
parentWidget); QString(),
} else { tr("CD-ROM images") % util::DlgFilter({ "iso", "cue" }) % tr("All files") % util::DlgFilter({ "*" }, true));
filename = QFileDialog::getOpenFileName(
parentWidget,
QString(),
QString(),
tr("CD-ROM images") % util::DlgFilter({ "iso", "cue" }) % tr("All files") % util::DlgFilter({ "*" }, true));
}
} }
if (filename.isEmpty()) { if (filename.isEmpty())
pclog("File is empty.\n");
return; return;
}
cdromMount(i, filename); cdromMount(i, filename);
} }
@@ -589,6 +577,9 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
QObjectList children; QObjectList children;
QFileInfo fi; QFileInfo fi;
QIcon menu_icon; QIcon menu_icon;
const auto fn = mhm.getImageForSlot(index, slot, type);
QString menu_item_name;
switch (type) { switch (type) {
case ui::MediaType::Optical: case ui::MediaType::Optical:
@@ -597,8 +588,18 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
menu = cdromMenus[index]; menu = cdromMenus[index];
children = menu->children(); children = menu->children();
imageHistoryUpdatePos = dynamic_cast<QAction *>(children[cdromImageHistoryPos[slot]]); imageHistoryUpdatePos = dynamic_cast<QAction *>(children[cdromImageHistoryPos[slot]]);
fi.setFile(mhm.getImageForSlot(index, slot, type)); if (fn.left(8) == "ioctl://") {
menu_icon = fi.isDir() ? QApplication::style()->standardIcon(QStyle::SP_DirIcon) : ProgSettings::loadIcon("/cdrom.ico"); menu_icon = QApplication::style()->standardIcon(QStyle::SP_DriveCDIcon);
#ifdef Q_OS_WINDOWS
menu_item_name = tr("Host CD/DVD Drive (%1)").arg(fn.right(2)).toUtf8().constData();
#else
menu_item_name = tr("Host CD/DVD Drive (%1)").arg(fn.right(name.length() - 8));
#endif
} else {
fi.setFile(fn);
menu_icon = fi.isDir() ? QApplication::style()->standardIcon(QStyle::SP_DirIcon) : ProgSettings::loadIcon("/cdrom.ico");
menu_item_name = fn.isEmpty() ? tr("previous image").toUtf8().constData() : fn.toUtf8().constData();
}
imageHistoryUpdatePos->setIcon(menu_icon); imageHistoryUpdatePos->setIcon(menu_icon);
break; break;
case ui::MediaType::Floppy: case ui::MediaType::Floppy:
@@ -607,17 +608,20 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
menu = floppyMenus[index]; menu = floppyMenus[index];
children = menu->children(); children = menu->children();
imageHistoryUpdatePos = dynamic_cast<QAction *>(children[floppyImageHistoryPos[slot]]); imageHistoryUpdatePos = dynamic_cast<QAction *>(children[floppyImageHistoryPos[slot]]);
fi.setFile(mhm.getImageForSlot(index, slot, type)); fi.setFile(fn);
menu_item_name = fi.fileName().isEmpty() ? tr("previous image").toUtf8().constData() : fi.fileName().toUtf8().constData();
break; break;
default: default:
pclog("History not yet implemented for media type %s\n", qPrintable(mhm.mediaTypeToString(type))); menu_item_name = fi.fileName().isEmpty() ? tr("previous image").toUtf8().constData() : fi.fileName().toUtf8().constData();
return; return;
} }
const QString menu_item_name = fi.fileName().isEmpty() ? tr("previous image").toUtf8().constData() : fi.fileName().toUtf8().constData();
imageHistoryUpdatePos->setText(QString::asprintf(tr("%s").toUtf8().constData(), menu_item_name.toUtf8().constData())); imageHistoryUpdatePos->setText(QString::asprintf(tr("%s").toUtf8().constData(), menu_item_name.toUtf8().constData()));
imageHistoryUpdatePos->setVisible(!fi.fileName().isEmpty());
imageHistoryUpdatePos->setVisible(fi.exists()); if (fn.left(8) == "ioctl://")
imageHistoryUpdatePos->setVisible(true);
else
imageHistoryUpdatePos->setVisible(!fn.isEmpty() && fi.exists());
} }
void void
@@ -630,8 +634,9 @@ MediaMenu::clearImageHistory()
void void
MediaMenu::cdromUpdateMenu(int i) MediaMenu::cdromUpdateMenu(int i)
{ {
QString name = cdrom[i].image_path; QString name = cdrom[i].image_path;
QFileInfo fi(cdrom[i].image_path); QString name2;
QIcon menu_icon;
if (!cdromMenus.contains(i)) if (!cdromMenus.contains(i))
return; return;
@@ -644,14 +649,27 @@ MediaMenu::cdromUpdateMenu(int i)
auto *imageMenu = dynamic_cast<QAction *>(childs[cdromImagePos]); auto *imageMenu = dynamic_cast<QAction *>(childs[cdromImagePos]);
imageMenu->setEnabled(!name.isEmpty()); imageMenu->setEnabled(!name.isEmpty());
const QString menu_item_name = name.isEmpty() ? QString().toUtf8().constData() : fi.fileName().toUtf8().constData(); QString menu_item_name;
const auto menu_icon = fi.isDir() ? QApplication::style()->standardIcon(QStyle::SP_DirIcon) : ProgSettings::loadIcon("/cdrom.ico"); if (name.left(8) == "ioctl://") {
#ifdef Q_OS_WINDOWS
menu_item_name = tr("Host CD/DVD Drive (%1)").arg(name.right(2)).toUtf8().constData();
#else
menu_item_name = tr("Host CD/DVD Drive (%1)").arg(name.right(name.length() - 8));
#endif
name2 = menu_item_name;
menu_icon = QApplication::style()->standardIcon(QStyle::SP_DriveCDIcon);
} else {
QFileInfo fi(cdrom[i].image_path);
menu_item_name = name.isEmpty() ? QString().toUtf8().constData() : name.toUtf8().constData();
name2 = name;
menu_icon = fi.isDir() ? QApplication::style()->standardIcon(QStyle::SP_DirIcon) : ProgSettings::loadIcon("/cdrom.ico");
}
imageMenu->setIcon(menu_icon); imageMenu->setIcon(menu_icon);
imageMenu->setText(QString::asprintf(tr("Eject %s").toUtf8().constData(), menu_item_name.toUtf8().constData())); imageMenu->setText(QString::asprintf(tr("Eject %s").toUtf8().constData(), menu_item_name.toUtf8().constData()));
for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) { for (int slot = 0; slot < MAX_PREV_IMAGES; slot++)
updateImageHistory(i, slot, ui::MediaType::Optical); updateImageHistory(i, slot, ui::MediaType::Optical);
}
QString busName = tr("Unknown Bus"); QString busName = tr("Unknown Bus");
switch (cdrom[i].bus_type) { switch (cdrom[i].bus_type) {
@@ -669,7 +687,7 @@ MediaMenu::cdromUpdateMenu(int i)
} }
// menu->setTitle(tr("CD-ROM %1 (%2): %3").arg(QString::number(i+1), busName, name.isEmpty() ? tr("(empty)") : name)); // menu->setTitle(tr("CD-ROM %1 (%2): %3").arg(QString::number(i+1), busName, name.isEmpty() ? tr("(empty)") : name));
menu->setTitle(QString::asprintf(tr("CD-ROM %i (%s): %s").toUtf8().constData(), i + 1, busName.toUtf8().data(), name.isEmpty() ? tr("(empty)").toUtf8().data() : name.toUtf8().data())); menu->setTitle(QString::asprintf(tr("CD-ROM %i (%s): %s").toUtf8().constData(), i + 1, busName.toUtf8().data(), name.isEmpty() ? tr("(empty)").toUtf8().data() : name2.toUtf8().data()));
} }
void void

2
src/qt/qt_mediamenu.hpp
View File

@@ -41,7 +41,7 @@ public:
void floppyUpdateMenu(int i); void floppyUpdateMenu(int i);
void cdromMute(int i); void cdromMute(int i);
void cdromMount(int i, int dir); void cdromMount(int i, int dir, const QString &arg);
void cdromMount(int i, const QString &filename); void cdromMount(int i, const QString &filename);
void cdromEject(int i); void cdromEject(int i);
void cdromReload(int index, int slot); void cdromReload(int index, int slot);

13
src/qt/qt_platform.cpp
View File

@@ -278,7 +278,7 @@ int
path_abs(char *path) path_abs(char *path)
{ {
#ifdef Q_OS_WINDOWS #ifdef Q_OS_WINDOWS
if ((path[1] == ':') || (path[0] == '\\') || (path[0] == '/')) if ((path[1] == ':') || (path[0] == '\\') || (path[0] == '/') || (strstr(path, "ioctl://") == path))
return 1; return 1;
return 0; return 0;
@@ -291,10 +291,13 @@ void
path_normalize(char *path) path_normalize(char *path)
{ {
#ifdef Q_OS_WINDOWS #ifdef Q_OS_WINDOWS
while (*path++ != 0) { if (strstr(path, "ioctl://") != path) {
if (*path == '\\') while (*path++ != 0) {
*path = '/'; if (*path == '\\')
} *path = '/';
}
} else
path[8] = path[9] = path[11] = '\\';
#endif #endif
} }

309
src/qt/win_cdrom_ioctl.c
View File

@@ -21,11 +21,17 @@
#include <windows.h> #include <windows.h>
#include <windowsx.h> #include <windowsx.h>
#undef BITMAP #undef BITMAP
#include <inttypes.h>
#include <io.h> #include <io.h>
#include "ntddcdrm.h" #include "ntddcdrm.h"
#include "ntddscsi.h" #include "ntddscsi.h"
#include <stdint.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#define HAVE_STDARG_H
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/scsi_device.h> #include <86box/scsi_device.h>
#include <86box/cdrom.h> #include <86box/cdrom.h>
@@ -37,8 +43,29 @@
of the audio while audio still plays. With an absolute conversion, the counter is fine. */ of the audio while audio still plays. With an absolute conversion, the counter is fine. */
#define MSFtoLBA(m, s, f) ((((m * 60) + s) * 75) + f) #define MSFtoLBA(m, s, f) ((((m * 60) + s) * 75) + f)
static HANDLE handle; static int toc_valid = 0;
static WCHAR ioctl_path[256]; static CDROM_TOC cur_toc = { 0 };
static HANDLE handle = NULL;
static WCHAR ioctl_path[256] = { 0 };
static WCHAR old_ioctl_path[256] = { 0 };
#ifdef ENABLE_WIN_CDROM_IOCTL_LOG
int win_cdrom_ioctl_do_log = ENABLE_WIN_CDROM_IOCTL_LOG;
void
win_cdrom_ioctl_log(const char *fmt, ...)
{
va_list ap;
if (win_cdrom_ioctl_do_log) {
va_start(ap, fmt);
pclog_ex(fmt, ap);
va_end(ap);
}
}
#else
# define win_cdrom_ioctl_log(fmt, ...)
#endif
static int static int
plat_cdrom_open(void) plat_cdrom_open(void)
@@ -46,7 +73,7 @@ plat_cdrom_open(void)
plat_cdrom_close(); plat_cdrom_close();
handle = CreateFileW((LPCWSTR)ioctl_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); handle = CreateFileW((LPCWSTR)ioctl_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
pclog("handle=%p, error=%x.\n", handle, GetLastError()); win_cdrom_ioctl_log("handle=%p, error=%x\n", handle, (unsigned int) GetLastError());
if (handle != INVALID_HANDLE_VALUE) { if (handle != INVALID_HANDLE_VALUE) {
long size; long size;
DeviceIoControl(handle, IOCTL_STORAGE_LOAD_MEDIA, NULL, 0, NULL, 0, (LPDWORD)&size, NULL); DeviceIoControl(handle, IOCTL_STORAGE_LOAD_MEDIA, NULL, 0, NULL, 0, (LPDWORD)&size, NULL);
@@ -55,88 +82,166 @@ plat_cdrom_open(void)
return 0; return 0;
} }
int static void
plat_cdrom_is_track_audio(uint32_t sector) plat_cdrom_read_toc(void)
{ {
CDROM_TOC toc; long size = 0;
long size = 0;
int ret;
int control = 0;
uint32_t track_addr = 0;
plat_cdrom_open(); if (!toc_valid) {
DeviceIoControl(handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), (LPDWORD)&size, NULL); toc_valid = 1;
plat_cdrom_close(); plat_cdrom_open();
DeviceIoControl(handle, IOCTL_CDROM_READ_TOC, NULL, 0, &cur_toc, sizeof(cur_toc), (LPDWORD)&size, NULL);
for (int c = 0; toc.TrackData[c].TrackNumber != 0xaa; c++) { plat_cdrom_close();
track_addr = MSFtoLBA(toc.TrackData[c].Address[1], toc.TrackData[c].Address[2], toc.TrackData[c].Address[3]);
if ((toc.TrackData[c].TrackNumber >= toc.FirstTrack) && (toc.TrackData[c].TrackNumber <= toc.LastTrack) &&
(track_addr >= sector))
control = toc.TrackData[c].Control;
break;
} }
ret = (control & 0x04) ? 0 : 1;
return ret;
} }
int int
plat_cdrom_is_track_audio(uint32_t sector)
{
int control = 0;
uint32_t track_addr = 0;
uint32_t next_track_addr = 0;
plat_cdrom_read_toc();
for (int c = 0; cur_toc.TrackData[c].TrackNumber != 0xaa; c++) {
track_addr = MSFtoLBA(cur_toc.TrackData[c].Address[1], cur_toc.TrackData[c].Address[2], cur_toc.TrackData[c].Address[3]) - 150;
next_track_addr = MSFtoLBA(cur_toc.TrackData[c + 1].Address[1], cur_toc.TrackData[c + 1].Address[2], cur_toc.TrackData[c + 1].Address[3]) - 150;
win_cdrom_ioctl_log("F: %i, L: %i, C: %i (%i), c: %02X, A: %08X, S: %08X\n",
cur_toc.FirstTrack, cur_toc.LastTrack,
cur_toc.TrackData[c].TrackNumber, c,
cur_toc.TrackData[c].Control, track_addr, sector);
if ((cur_toc.TrackData[c].TrackNumber >= cur_toc.FirstTrack) && (cur_toc.TrackData[c].TrackNumber <= cur_toc.LastTrack) &&
(sector >= track_addr) && (sector <= next_track_addr)) {
control = cur_toc.TrackData[c].Control;
break;
}
}
const int ret = !(control & 0x04);
win_cdrom_ioctl_log("plat_cdrom_is_track_audio(%08X): %i\n", sector, ret);
return ret;
}
uint32_t
plat_cdrom_get_track_start(uint32_t sector, uint8_t *attr, uint8_t *track)
{
uint32_t track_addr = 0;
uint32_t next_track_addr = 0;
plat_cdrom_read_toc();
for (int c = 0; cur_toc.TrackData[c].TrackNumber != 0xaa; c++) {
track_addr = MSFtoLBA(cur_toc.TrackData[c].Address[1], cur_toc.TrackData[c].Address[2], cur_toc.TrackData[c].Address[3]) - 150;
next_track_addr = MSFtoLBA(cur_toc.TrackData[c + 1].Address[1], cur_toc.TrackData[c + 1].Address[2], cur_toc.TrackData[c + 1].Address[3]) - 150;
win_cdrom_ioctl_log("F: %i, L: %i, C: %i (%i), c: %02X, A: %08X, S: %08X\n",
cur_toc.FirstTrack, cur_toc.LastTrack,
cur_toc.TrackData[c].TrackNumber, c,
cur_toc.TrackData[c].Control, track_addr, sector);
if ((cur_toc.TrackData[c].TrackNumber >= cur_toc.FirstTrack) && (cur_toc.TrackData[c].TrackNumber <= cur_toc.LastTrack) &&
(sector >= track_addr) && (sector <= next_track_addr)) {
*track = cur_toc.TrackData[c].TrackNumber;
*attr = cur_toc.TrackData[c].Control;
break;
}
}
win_cdrom_ioctl_log("plat_cdrom_get_track_start(%08X): %i\n", sector, track_addr);
return track_addr;
}
uint32_t
plat_cdrom_get_last_block(void) plat_cdrom_get_last_block(void)
{ {
CDROM_TOC toc; uint32_t lb = 0;
int lb = 0; uint32_t address = 0;
long size = 0;
uint32_t address = 0;
plat_cdrom_open(); plat_cdrom_read_toc();
DeviceIoControl(handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), (LPDWORD)&size, NULL);
plat_cdrom_close();
for (int c = 0; c <= toc.LastTrack; c++) { for (int c = 0; c <= cur_toc.LastTrack; c++) {
address = MSFtoLBA(toc.TrackData[c].Address[1], toc.TrackData[c].Address[2], toc.TrackData[c].Address[3]); address = MSFtoLBA(cur_toc.TrackData[c].Address[1], cur_toc.TrackData[c].Address[2], cur_toc.TrackData[c].Address[3]) - 150;
if (address > lb) if (address > lb)
lb = address; lb = address;
} }
pclog("LBCapacity=%d.\n", lb); win_cdrom_ioctl_log("LBCapacity=%d\n", lb);
return lb; return lb;
} }
int
plat_cdrom_ext_medium_changed(void)
{
long size;
CDROM_TOC toc;
int ret = 0;
plat_cdrom_open();
int temp = DeviceIoControl(handle, IOCTL_CDROM_READ_TOC,
NULL, 0, &toc, sizeof(toc),
(LPDWORD)&size, NULL);
plat_cdrom_close();
if (!temp)
/* There has been some kind of error - not a medium change, but a not ready
condition. */
ret = -1;
else if (!toc_valid || (memcmp(ioctl_path, old_ioctl_path, sizeof(ioctl_path)) != 0)) {
/* Changed to a different host drive - we already detect such medium changes. */
toc_valid = 1;
cur_toc = toc;
if (memcmp(ioctl_path, old_ioctl_path, sizeof(ioctl_path)) != 0)
memcpy(old_ioctl_path, ioctl_path, sizeof(ioctl_path));
} else if ((toc.TrackData[toc.LastTrack].Address[1] !=
cur_toc.TrackData[cur_toc.LastTrack].Address[1]) ||
(toc.TrackData[toc.LastTrack].Address[2] !=
cur_toc.TrackData[cur_toc.LastTrack].Address[2]) ||
(toc.TrackData[toc.LastTrack].Address[3] !=
cur_toc.TrackData[cur_toc.LastTrack].Address[3]))
/* The TOC has changed. */
ret = 1;
win_cdrom_ioctl_log("plat_cdrom_ext_medium_changed(): %i\n", ret);
return ret;
}
void void
plat_cdrom_get_audio_tracks(int *st_track, int *end, TMSF *lead_out) plat_cdrom_get_audio_tracks(int *st_track, int *end, TMSF *lead_out)
{ {
CDROM_TOC toc; plat_cdrom_read_toc();
long size = 0;
plat_cdrom_open();
DeviceIoControl(handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), (LPDWORD)&size, NULL);
plat_cdrom_close();
*st_track = 1; *st_track = 1;
*end = toc.LastTrack; *end = cur_toc.LastTrack;
lead_out->min = toc.TrackData[toc.LastTrack].Address[1]; lead_out->min = cur_toc.TrackData[cur_toc.LastTrack].Address[1];
lead_out->sec = toc.TrackData[toc.LastTrack].Address[2]; lead_out->sec = cur_toc.TrackData[cur_toc.LastTrack].Address[2];
lead_out->fr = toc.TrackData[toc.LastTrack].Address[3]; lead_out->fr = cur_toc.TrackData[cur_toc.LastTrack].Address[3];
win_cdrom_ioctl_log("plat_cdrom_get_audio_tracks(): %02i, %02i, %02i:%02i:%02i\n",
*st_track, *end, lead_out->min, lead_out->sec, lead_out->fr);
} }
/* This replaces both Info and EndInfo, they are specified by a variable. */ /* This replaces both Info and EndInfo, they are specified by a variable. */
int int
plat_cdrom_get_audio_track_info(UNUSED(int end), int track, int *track_num, TMSF *start, uint8_t *attr) plat_cdrom_get_audio_track_info(UNUSED(int end), int track, int *track_num, TMSF *start, uint8_t *attr)
{ {
CDROM_TOC toc; plat_cdrom_read_toc();
long size = 0;
plat_cdrom_open(); if ((track < 1) || (track == 0xaa) || (track > (cur_toc.LastTrack + 1))) {
DeviceIoControl(handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), (LPDWORD)&size, NULL); win_cdrom_ioctl_log("plat_cdrom_get_audio_track_info(%02i)\n", track);
plat_cdrom_close();
if ((track < 1) || (track == 0xaa) || (track > (toc.LastTrack)))
return 0; return 0;
}
start->min = toc.TrackData[track - 1].Address[1]; start->min = cur_toc.TrackData[track - 1].Address[1];
start->sec = toc.TrackData[track - 1].Address[2]; start->sec = cur_toc.TrackData[track - 1].Address[2];
start->fr = toc.TrackData[track - 1].Address[3]; start->fr = cur_toc.TrackData[track - 1].Address[3];
*track_num = toc.TrackData[track - 1].TrackNumber; *track_num = cur_toc.TrackData[track - 1].TrackNumber;
*attr = toc.TrackData[track - 1].Control; *attr = cur_toc.TrackData[track - 1].Control;
win_cdrom_ioctl_log("plat_cdrom_get_audio_track_info(%02i): %02i:%02i:%02i, %02i, %02X\n",
track, start->min, start->sec, start->fr, *track_num, *attr);
return 1; return 1;
} }
@@ -145,14 +250,14 @@ plat_cdrom_get_audio_track_info(UNUSED(int end), int track, int *track_num, TMSF
int int
plat_cdrom_get_audio_sub(UNUSED(uint32_t sector), uint8_t *attr, uint8_t *track, uint8_t *index, TMSF *rel_pos, TMSF *abs_pos) plat_cdrom_get_audio_sub(UNUSED(uint32_t sector), uint8_t *attr, uint8_t *track, uint8_t *index, TMSF *rel_pos, TMSF *abs_pos)
{ {
CDROM_SUB_Q_DATA_FORMAT insub; CDROM_SUB_Q_DATA_FORMAT insub;
SUB_Q_CHANNEL_DATA sub; SUB_Q_CHANNEL_DATA sub;
long size = 0; long size = 0;
insub.Format = IOCTL_CDROM_CURRENT_POSITION; insub.Format = IOCTL_CDROM_CURRENT_POSITION;
plat_cdrom_open(); plat_cdrom_open();
DeviceIoControl(handle, IOCTL_CDROM_READ_Q_CHANNEL, &insub, sizeof(insub), &sub, sizeof(sub), (LPDWORD)&size, NULL); DeviceIoControl(handle, IOCTL_CDROM_READ_Q_CHANNEL, &insub, sizeof(insub), &sub, sizeof(sub), (LPDWORD)&size, NULL);
plat_cdrom_close(); plat_cdrom_close();
if (sub.CurrentPosition.TrackNumber < 1) if (sub.CurrentPosition.TrackNumber < 1)
@@ -162,12 +267,15 @@ plat_cdrom_get_audio_sub(UNUSED(uint32_t sector), uint8_t *attr, uint8_t *track,
*attr = sub.CurrentPosition.Control; *attr = sub.CurrentPosition.Control;
*index = sub.CurrentPosition.IndexNumber; *index = sub.CurrentPosition.IndexNumber;
rel_pos->min = sub.CurrentPosition.TrackRelativeAddress[1]; rel_pos->min = sub.CurrentPosition.TrackRelativeAddress[1];
rel_pos->sec = sub.CurrentPosition.TrackRelativeAddress[2]; rel_pos->sec = sub.CurrentPosition.TrackRelativeAddress[2];
rel_pos->fr = sub.CurrentPosition.TrackRelativeAddress[3]; rel_pos->fr = sub.CurrentPosition.TrackRelativeAddress[3];
abs_pos->min = sub.CurrentPosition.AbsoluteAddress[1]; abs_pos->min = sub.CurrentPosition.AbsoluteAddress[1];
abs_pos->sec = sub.CurrentPosition.AbsoluteAddress[2]; abs_pos->sec = sub.CurrentPosition.AbsoluteAddress[2];
abs_pos->fr = sub.CurrentPosition.AbsoluteAddress[3]; abs_pos->fr = sub.CurrentPosition.AbsoluteAddress[3];
win_cdrom_ioctl_log("plat_cdrom_get_audio_sub(): %02i, %02X, %02i, %02i:%02i:%02i, %02i:%02i:%02i\n",
*track, *attr, *index, rel_pos->min, rel_pos->sec, rel_pos->fr, abs_pos->min, abs_pos->sec, abs_pos->fr);
return 1; return 1;
} }
@@ -179,55 +287,55 @@ plat_cdrom_get_sector_size(UNUSED(uint32_t sector))
DISK_GEOMETRY dgCDROM; DISK_GEOMETRY dgCDROM;
plat_cdrom_open(); plat_cdrom_open();
DeviceIoControl(handle, IOCTL_CDROM_GET_DRIVE_GEOMETRY, NULL, 0, &dgCDROM, sizeof(dgCDROM), (LPDWORD)&size, NULL); DeviceIoControl(handle, IOCTL_CDROM_GET_DRIVE_GEOMETRY, NULL, 0, &dgCDROM, sizeof(dgCDROM), (LPDWORD)&size, NULL);
plat_cdrom_close(); plat_cdrom_close();
pclog("BytesPerSector=%d.\n", dgCDROM.BytesPerSector); win_cdrom_ioctl_log("BytesPerSector=%d\n", dgCDROM.BytesPerSector);
return dgCDROM.BytesPerSector; return dgCDROM.BytesPerSector;
} }
int int
plat_cdrom_read_sector(uint8_t *buffer, int raw, uint32_t sector) plat_cdrom_read_sector(uint8_t *buffer, int raw, uint32_t sector)
{ {
LARGE_INTEGER pos;
BOOL status; BOOL status;
long size = 0; long size = 0;
int buflen = raw ? RAW_SECTOR_SIZE : COOKED_SECTOR_SIZE;
int buflen = raw ? RAW_SECTOR_SIZE : COOKED_SECTOR_SIZE; plat_cdrom_open();
plat_cdrom_open(); if (!raw) {
if (!raw) { win_cdrom_ioctl_log("Cooked\n");
pclog("Cooked.\n"); /* Cooked */
// Cooked int success = 0;
int success = 0; DWORD newPos = SetFilePointer(handle, sector * COOKED_SECTOR_SIZE, 0, FILE_BEGIN);
DWORD newPos = SetFilePointer(handle, sector * COOKED_SECTOR_SIZE, 0, FILE_BEGIN); if (newPos != 0xFFFFFFFF)
if (newPos != 0xFFFFFFFF)
success = ReadFile(handle, buffer, buflen, (LPDWORD)&size, NULL); success = ReadFile(handle, buffer, buflen, (LPDWORD)&size, NULL);
status = (success != 0); status = (success != 0);
} else { } else {
pclog("Raw.\n"); win_cdrom_ioctl_log("Raw\n");
// Raw /* Raw */
RAW_READ_INFO in; RAW_READ_INFO in;
in.DiskOffset.LowPart = sector * COOKED_SECTOR_SIZE; in.DiskOffset.LowPart = sector * COOKED_SECTOR_SIZE;
in.DiskOffset.HighPart = 0; in.DiskOffset.HighPart = 0;
in.SectorCount = 1; in.SectorCount = 1;
in.TrackMode = CDDA; in.TrackMode = CDDA;
status = DeviceIoControl(handle, IOCTL_CDROM_RAW_READ, &in, sizeof(in), status = DeviceIoControl(handle, IOCTL_CDROM_RAW_READ, &in, sizeof(in),
buffer, buflen, (LPDWORD)&size, NULL); buffer, buflen, (LPDWORD)&size, NULL);
} }
plat_cdrom_close(); plat_cdrom_close();
pclog("ReadSector status=%d, sector=%d, size=%d.\n", status, sector, size); win_cdrom_ioctl_log("ReadSector status=%d, sector=%d, size=%d.\n", status, sector, size);
return (size == buflen) && (status > 0);
return (size == buflen) && (status > 0);
} }
void void
plat_cdrom_eject(void) plat_cdrom_eject(void)
{ {
long size; long size;
int ret;
plat_cdrom_open(); plat_cdrom_open();
DeviceIoControl(handle, IOCTL_STORAGE_EJECT_MEDIA, NULL, 0, NULL, 0, (LPDWORD)&size, NULL); DeviceIoControl(handle, IOCTL_STORAGE_EJECT_MEDIA, NULL, 0, NULL, 0, (LPDWORD)&size, NULL);
plat_cdrom_close(); plat_cdrom_close();
} }
@@ -241,12 +349,17 @@ plat_cdrom_close(void)
} }
int int
plat_cdrom_set_drive(int drive) plat_cdrom_set_drive(const char *drv)
{ {
plat_cdrom_close(); plat_cdrom_close();
wsprintf(ioctl_path, L"\\\\.\\%c:", drive); memcpy(old_ioctl_path, ioctl_path, sizeof(ioctl_path));
pclog("Path is %s\n", ioctl_path); memset(ioctl_path, 0x00, sizeof(ioctl_path));
wsprintf(ioctl_path, L"%S", drv);
win_cdrom_ioctl_log("Path is %S\n", ioctl_path);
toc_valid = 0;
plat_cdrom_open(); plat_cdrom_open();
return 1; return 1;

8
src/scsi/scsi_cdrom.c
View File

@@ -1557,6 +1557,10 @@ static int
scsi_cdrom_pre_execution_check(scsi_cdrom_t *dev, uint8_t *cdb) scsi_cdrom_pre_execution_check(scsi_cdrom_t *dev, uint8_t *cdb)
{ {
int ready = 0; int ready = 0;
int ext_medium_changed = 0;
if (dev->drv && dev->drv->ops && dev->drv->ops->ext_medium_changed)
ext_medium_changed = dev->drv->ops->ext_medium_changed(dev->drv);
if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) && (cdb[1] & 0xe0)) { if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) && (cdb[1] & 0xe0)) {
scsi_cdrom_log("CD-ROM %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n", scsi_cdrom_log("CD-ROM %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n",
@@ -1590,10 +1594,10 @@ scsi_cdrom_pre_execution_check(scsi_cdrom_t *dev, uint8_t *cdb)
goto skip_ready_check; goto skip_ready_check;
} }
if (dev->drv->cd_status & CD_STATUS_MEDIUM_CHANGED) if ((dev->drv->cd_status & CD_STATUS_MEDIUM_CHANGED) || (ext_medium_changed == 1))
scsi_cdrom_insert((void *) dev); scsi_cdrom_insert((void *) dev);
ready = (dev->drv->cd_status != CD_STATUS_EMPTY); ready = (dev->drv->cd_status != CD_STATUS_EMPTY) || (ext_medium_changed == -1);
skip_ready_check: skip_ready_check:
/* If the drive is not ready, there is no reason to keep the /* If the drive is not ready, there is no reason to keep the