Merge remote-tracking branch 'origin/master' into cdrom_changes
This commit is contained in:
@@ -3503,7 +3503,7 @@ const device_t ide_vlb_device = {
|
||||
const device_t ide_vlb_sec_device = {
|
||||
.name = "VLB IDE Controller (Secondary)",
|
||||
.internal_name = "ide_vlb_sec",
|
||||
.flags = DEVICE_VLB | DEVICE_ISA16,
|
||||
.flags = DEVICE_VLB,
|
||||
.local = 2,
|
||||
.init = ide_sec_init,
|
||||
.close = ide_sec_close,
|
||||
@@ -3517,7 +3517,7 @@ const device_t ide_vlb_sec_device = {
|
||||
const device_t ide_vlb_2ch_device = {
|
||||
.name = "VLB IDE Controller (Dual-Channel)",
|
||||
.internal_name = "ide_vlb_2ch",
|
||||
.flags = DEVICE_VLB | DEVICE_ISA16,
|
||||
.flags = DEVICE_VLB,
|
||||
.local = 3,
|
||||
.init = ide_init,
|
||||
.close = ide_close,
|
||||
@@ -3531,7 +3531,7 @@ const device_t ide_vlb_2ch_device = {
|
||||
const device_t ide_pci_device = {
|
||||
.name = "PCI IDE Controller",
|
||||
.internal_name = "ide_pci",
|
||||
.flags = DEVICE_PCI | DEVICE_ISA16,
|
||||
.flags = DEVICE_PCI,
|
||||
.local = 4,
|
||||
.init = ide_init,
|
||||
.close = ide_close,
|
||||
@@ -3545,7 +3545,7 @@ const device_t ide_pci_device = {
|
||||
const device_t ide_pci_sec_device = {
|
||||
.name = "PCI IDE Controller (Secondary)",
|
||||
.internal_name = "ide_pci_sec",
|
||||
.flags = DEVICE_PCI | DEVICE_ISA16,
|
||||
.flags = DEVICE_PCI,
|
||||
.local = 4,
|
||||
.init = ide_sec_init,
|
||||
.close = ide_sec_close,
|
||||
@@ -3559,7 +3559,7 @@ const device_t ide_pci_sec_device = {
|
||||
const device_t ide_pci_2ch_device = {
|
||||
.name = "PCI IDE Controller (Dual-Channel)",
|
||||
.internal_name = "ide_pci_2ch",
|
||||
.flags = DEVICE_PCI | DEVICE_ISA16,
|
||||
.flags = DEVICE_PCI,
|
||||
.local = 5,
|
||||
.init = ide_init,
|
||||
.close = ide_close,
|
||||
|
||||
Reference in New Issue
Block a user