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

ATAPI CD-ROM normal model now identifies as a SONY CDU-76 when the machine is a Sony, the Sony Vaio recovery disk should now work.

Browse Source
This commit is contained in:
OBattler
2022-11-19 23:40:14 +01:00
parent 38b9d4e9fa
commit c63f9e23a7
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/machine.h
View File

@@ -340,6 +340,7 @@ extern int machine_get_ram_granularity(int m);
extern int machine_get_type(int m); extern int machine_get_type(int m);
extern void machine_close(void); extern void machine_close(void);
extern int machine_has_mouse(void); extern int machine_has_mouse(void);
extern int machine_is_sony(void);
extern uint8_t machine_get_p1(void); extern uint8_t machine_get_p1(void);
extern void machine_load_p1(int m); extern void machine_load_p1(int m);

6
src/machine/machine_table.c
View File

@@ -12139,3 +12139,9 @@ machine_has_mouse(void)
{ {
return (machines[machine].flags & MACHINE_MOUSE); return (machines[machine].flags & MACHINE_MOUSE);
} }
int
machine_is_sony(void)
{
return (!strcmp(machines[machine].internal_name, "pcv90"));
}

12
src/scsi/scsi_cdrom.c
View File

@@ -30,6 +30,7 @@
#include <86box/device.h> #include <86box/device.h>
#include <86box/scsi.h> #include <86box/scsi.h>
#include <86box/scsi_device.h> #include <86box/scsi_device.h>
#include <86box/machine.h>
#include <86box/nvr.h> #include <86box/nvr.h>
#include <86box/hdc.h> #include <86box/hdc.h>
#include <86box/hdc_ide.h> #include <86box/hdc_ide.h>
@@ -2373,6 +2374,8 @@ scsi_cdrom_command(scsi_common_t *sc, uint8_t *cdb)
} else { } else {
if (dev->early) if (dev->early)
ide_padstr8(dev->buffer + idx, 8, "NEC"); /* Vendor */ ide_padstr8(dev->buffer + idx, 8, "NEC"); /* Vendor */
else if (machine_is_sony())
ide_padstr8(dev->buffer + idx, 8, "SONY"); /* Vendor */
else else
ide_padstr8(dev->buffer + idx, 8, "HITACHI"); /* Vendor */ ide_padstr8(dev->buffer + idx, 8, "HITACHI"); /* Vendor */
} }
@@ -2389,6 +2392,8 @@ scsi_cdrom_command(scsi_common_t *sc, uint8_t *cdb)
} else { } else {
if (dev->early) if (dev->early)
ide_padstr8(dev->buffer + idx, 40, "CD-ROM DRIVE:260"); /* Product */ ide_padstr8(dev->buffer + idx, 40, "CD-ROM DRIVE:260"); /* Product */
else if (machine_is_sony())
ide_padstr8(dev->buffer + idx, 40, "CD-ROM CDU76"); /* Product */
else else
ide_padstr8(dev->buffer + idx, 40, "CDR-8130"); /* Product */ ide_padstr8(dev->buffer + idx, 40, "CDR-8130"); /* Product */
} }
@@ -2446,6 +2451,10 @@ scsi_cdrom_command(scsi_common_t *sc, uint8_t *cdb)
ide_padstr8(dev->buffer + 8, 8, "NEC"); /* Vendor */ ide_padstr8(dev->buffer + 8, 8, "NEC"); /* Vendor */
ide_padstr8(dev->buffer + 16, 16, "CD-ROM DRIVE:260"); /* Product */ ide_padstr8(dev->buffer + 16, 16, "CD-ROM DRIVE:260"); /* Product */
ide_padstr8(dev->buffer + 32, 4, "1.01"); /* Revision */ ide_padstr8(dev->buffer + 32, 4, "1.01"); /* Revision */
} else if (machine_is_sony()) {
ide_padstr8(dev->buffer + 8, 8, "SONY"); /* Vendor */
ide_padstr8(dev->buffer + 16, 16, "CD-ROM CDU76"); /* Product */
ide_padstr8(dev->buffer + 32, 4, "1.0i"); /* Revision */
} else { } else {
ide_padstr8(dev->buffer + 8, 8, "HITACHI"); /* Vendor */ ide_padstr8(dev->buffer + 8, 8, "HITACHI"); /* Vendor */
ide_padstr8(dev->buffer + 16, 16, "CDR-8130"); /* Product */ ide_padstr8(dev->buffer + 16, 16, "CDR-8130"); /* Product */
@@ -2749,6 +2758,9 @@ scsi_cdrom_identify(ide_t *ide, int ide_has_dma)
ide_padstr((char *) (ide->buffer + 23), ".110 ", 8); /* Firmware */ ide_padstr((char *) (ide->buffer + 23), ".110 ", 8); /* Firmware */
ide_padstr((char *) (ide->buffer + 27), "EN C DCR-MOD IREV2:06 ", 40); /* Model */ ide_padstr((char *) (ide->buffer + 27), "EN C DCR-MOD IREV2:06 ", 40); /* Model */
# endif # endif
} else if (machine_is_sony()) {
ide_padstr((char *) (ide->buffer + 23), "1.0i ", 8); /* Firmware */
ide_padstr((char *) (ide->buffer + 27), "CD-ROM CDU76 ", 40); /* Model */
} else { } else {
ide_padstr((char *) (ide->buffer + 23), "0020 ", 8); /* Firmware */ ide_padstr((char *) (ide->buffer + 23), "0020 ", 8); /* Firmware */
ide_padstr((char *) (ide->buffer + 27), "HITACHI CDR-8130 ", 40); /* Model */ ide_padstr((char *) (ide->buffer + 27), "HITACHI CDR-8130 ", 40); /* Model */