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

Merged the PC87306 #define's with the PC87307/9 ones.

Browse Source
This commit is contained in:
OBattler
2025-08-03 18:32:52 +02:00
parent a69f80c005
commit 6e3e951860
5 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/include/86box/sio.h
View File

@@ -84,22 +84,6 @@ extern const device_t i82091aa_ide_device;
extern const device_t pc87310_device; extern const device_t pc87310_device;
/* National Semiconductors */ /* National Semiconductors */
#define PC8730X_AMI_MEGAKEY FDC37XXX2
#define PC8730X_PHOENIX_42 FDC37XXX5
#define PC8730X_PHOENIX_42I FDC37XXX7
#define PC8730X_KBC FDC37XXXX_KBC
extern const device_t pc87306_device;
extern const device_t pc87311_device;
extern const device_t pc87311_ide_device;
extern const device_t pc87332_device;
extern const device_t pc87332_398_device;
extern const device_t pc87332_398_ide_device;
extern const device_t pc87332_398_ide_sec_device;
extern const device_t pc87332_398_ide_fdcon_device;
/* National Semiconductors PC87307 / PC87309 */
#define PCX7307_PC87307 0x00c0 #define PCX7307_PC87307 0x00c0
#define PCX7307_PC97307 0x00cf #define PCX7307_PC97307 0x00cf
@@ -114,6 +98,17 @@ extern const device_t pc87332_398_ide_fdcon_device;
#define PCX730X_15C 0x2000 #define PCX730X_15C 0x2000
extern const device_t pc87306_device;
extern const device_t pc87311_device;
extern const device_t pc87311_ide_device;
extern const device_t pc87332_device;
extern const device_t pc87332_398_device;
extern const device_t pc87332_398_ide_device;
extern const device_t pc87332_398_ide_sec_device;
extern const device_t pc87332_398_ide_fdcon_device;
/* National Semiconductors PC87307 / PC87309 */
extern const device_t pc87307_device; extern const device_t pc87307_device;
extern const device_t pc87309_device; extern const device_t pc87309_device;

2
src/machine/m_at_socket5.c
View File

@@ -409,7 +409,7 @@ machine_at_zappa_init(const machine_t *model)
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&i430fx_device); device_add(&i430fx_device);
device_add(&piix_device); device_add(&piix_device);
device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY); device_add_params(&pc87306_device, (void *) PCX730X_AMI);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
return ret; return ret;

10
src/machine/m_at_socket7.c
View File

@@ -244,7 +244,7 @@ machine_at_tc430hx_init(const machine_t *model)
device_add(&i430hx_device); device_add(&i430hx_device);
device_add(&piix3_device); device_add(&piix3_device);
device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY); device_add_params(&pc87306_device, (void *) PCX730X_AMI);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
return ret; return ret;
@@ -282,7 +282,7 @@ machine_at_infinia7200_init(const machine_t *model)
device_add(&i430hx_device); device_add(&i430hx_device);
device_add(&piix3_device); device_add(&piix3_device);
device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY); device_add_params(&pc87306_device, (void *) PCX730X_AMI);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
return ret; return ret;
@@ -340,7 +340,7 @@ machine_at_cu430hx_common_init(const machine_t *model)
device_add(&i430hx_device); device_add(&i430hx_device);
device_add(&piix3_device); device_add(&piix3_device);
device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY); device_add_params(&pc87306_device, (void *) PCX730X_AMI);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
} }
@@ -412,7 +412,7 @@ machine_at_pcv90_init(const machine_t *model)
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&i430hx_device); device_add(&i430hx_device);
device_add(&piix3_device); device_add(&piix3_device);
device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY); device_add_params(&pc87306_device, (void *) PCX730X_AMI);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
return ret; return ret;
@@ -730,7 +730,7 @@ machine_at_pb680_init(const machine_t *model)
device_add(&i430vx_device); device_add(&i430vx_device);
device_add(&piix3_device); device_add(&piix3_device);
device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY); device_add_params(&pc87306_device, (void *) PCX730X_AMI);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
return ret; return ret;

8
src/machine/m_at_socket7_3v.c
View File

@@ -108,7 +108,7 @@ machine_at_thor_common_init(const machine_t *model, int has_video)
device_add(&i430fx_device); device_add(&i430fx_device);
device_add(&piix_device); device_add(&piix_device);
device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY); device_add_params(&pc87306_device, (void *) PCX730X_AMI);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
} }
@@ -360,7 +360,7 @@ machine_at_endeavor_init(const machine_t *model)
device_add(&i430fx_device); device_add(&i430fx_device);
device_add(&piix_device); device_add(&piix_device);
device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY); device_add_params(&pc87306_device, (void *) PCX730X_AMI);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
return ret; return ret;
@@ -455,7 +455,7 @@ machine_at_pb640_init(const machine_t *model)
if (gfxcard[0] == VID_INTERNAL) if (gfxcard[0] == VID_INTERNAL)
device_add(machine_get_vid_device(machine)); device_add(machine_get_vid_device(machine));
device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY); device_add_params(&pc87306_device, (void *) PCX730X_AMI);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
return ret; return ret;
@@ -715,7 +715,7 @@ machine_at_p55t2s_init(const machine_t *model)
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&i430hx_device); device_add(&i430hx_device);
device_add(&piix3_device); device_add(&piix3_device);
device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY); device_add_params(&pc87306_device, (void *) PCX730X_AMI);
device_add(&intel_flash_bxt_device); device_add(&intel_flash_bxt_device);
return ret; return ret;

8
src/sio/sio_pc87306.c
View File

@@ -509,7 +509,7 @@ pc87306_init(UNUSED(const device_t *info))
{ {
pc87306_t *dev = (pc87306_t *) calloc(1, sizeof(pc87306_t)); pc87306_t *dev = (pc87306_t *) calloc(1, sizeof(pc87306_t));
dev->kbc_type = info->local & PC8730X_KBC; dev->kbc_type = info->local & PCX730X_KBC;
dev->fdc = device_add(&fdc_at_nsc_device); dev->fdc = device_add(&fdc_at_nsc_device);
@@ -521,14 +521,14 @@ pc87306_init(UNUSED(const device_t *info))
dev->nvr = device_add(&at_mb_nvr_device); dev->nvr = device_add(&at_mb_nvr_device);
switch (dev->kbc_type) { switch (dev->kbc_type) {
case PC8730X_AMI_MEGAKEY: case PCX730X_AMI:
default: default:
dev->kbc = device_add(&kbc_ps2_intel_ami_pci_device); dev->kbc = device_add(&kbc_ps2_intel_ami_pci_device);
break; break;
case PC8730X_PHOENIX_42: case PCX730X_PHOENIX_42:
dev->kbc = device_add(&kbc_ps2_phoenix_device); dev->kbc = device_add(&kbc_ps2_phoenix_device);
break; break;
case PC8730X_PHOENIX_42I: case PCX730X_PHOENIX_42I:
dev->kbc = device_add(&kbc_ps2_phoenix_pci_device); dev->kbc = device_add(&kbc_ps2_phoenix_pci_device);
break; break;
} }