Added keyboard type selection.
This commit is contained in:
@@ -523,7 +523,7 @@ ali5123_init(const device_t *info)
|
||||
io_sethandler(FDC_PRIMARY_ADDR, 0x0002,
|
||||
ali5123_read, NULL, NULL, ali5123_write, NULL, NULL, dev);
|
||||
|
||||
device_add(&keyboard_ps2_ali_pci_device);
|
||||
device_add(&kbc_ps2_ali_pci_device);
|
||||
|
||||
return dev;
|
||||
}
|
||||
|
||||
@@ -1835,20 +1835,20 @@ fdc37c93x_init(const device_t *info)
|
||||
|
||||
switch (dev->kbc_type) {
|
||||
case FDC37C931:
|
||||
dev->kbc = device_add(&keyboard_ps2_compaq_device);
|
||||
dev->kbc = device_add(&kbc_ps2_compaq_device);
|
||||
break;
|
||||
case FDC37C932:
|
||||
dev->kbc = device_add(&keyboard_ps2_intel_ami_pci_device);
|
||||
dev->kbc = device_add(&kbc_ps2_intel_ami_pci_device);
|
||||
break;
|
||||
case FDC37C933:
|
||||
default:
|
||||
dev->kbc = device_add(&keyboard_ps2_pci_device);
|
||||
dev->kbc = device_add(&kbc_ps2_pci_device);
|
||||
break;
|
||||
case FDC37C935:
|
||||
dev->kbc = device_add(&keyboard_ps2_phoenix_device);
|
||||
dev->kbc = device_add(&kbc_ps2_phoenix_device);
|
||||
break;
|
||||
case FDC37C937:
|
||||
dev->kbc = device_add(&keyboard_ps2_phoenix_pci_device);
|
||||
dev->kbc = device_add(&kbc_ps2_phoenix_pci_device);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -853,14 +853,14 @@ pc87307_init(const device_t *info)
|
||||
switch (info->local & PCX730X_KBC) {
|
||||
default:
|
||||
case PCX730X_AMI:
|
||||
dev->kbc = device_add(&keyboard_ps2_intel_ami_pci_device);
|
||||
dev->kbc = device_add(&kbc_ps2_intel_ami_pci_device);
|
||||
break;
|
||||
/* Optiplex! */
|
||||
case PCX730X_PHOENIX_42:
|
||||
dev->kbc = device_add(&keyboard_ps2_phoenix_device);
|
||||
dev->kbc = device_add(&kbc_ps2_phoenix_device);
|
||||
break;
|
||||
case PCX730X_PHOENIX_42I:
|
||||
dev->kbc = device_add(&keyboard_ps2_phoenix_pci_device);
|
||||
dev->kbc = device_add(&kbc_ps2_phoenix_pci_device);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -688,14 +688,14 @@ pc87309_init(const device_t *info)
|
||||
switch (info->local & PCX730X_KBC) {
|
||||
default:
|
||||
case PCX730X_AMI:
|
||||
dev->kbc = device_add(&keyboard_ps2_intel_ami_pci_device);
|
||||
dev->kbc = device_add(&kbc_ps2_intel_ami_pci_device);
|
||||
break;
|
||||
/* Optiplex! */
|
||||
case PCX730X_PHOENIX_42:
|
||||
dev->kbc = device_add(&keyboard_ps2_phoenix_device);
|
||||
dev->kbc = device_add(&kbc_ps2_phoenix_device);
|
||||
break;
|
||||
case PCX730X_PHOENIX_42I:
|
||||
dev->kbc = device_add(&keyboard_ps2_phoenix_pci_device);
|
||||
dev->kbc = device_add(&kbc_ps2_phoenix_pci_device);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -143,7 +143,7 @@ vl82c113_init(UNUSED(const device_t *info))
|
||||
dev->nvr_base = 0x0070;
|
||||
|
||||
/* Commands are standard. */
|
||||
dev->kbc = device_add(&keyboard_at_device);
|
||||
dev->kbc = device_add(&kbc_at_device);
|
||||
|
||||
vl82c113_reset(dev);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user