summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2022-08-23 18:17:58 +1000
committerDamien Zammit <damien@zamaudio.com>2022-08-23 18:17:58 +1000
commit99a0c77c98159459492d0ada0d489c6c6749cb8c (patch)
tree8f322cac6fb5698b71648cdfa97e6d027bc5467e
parent361356b08003f5e3c606e16eeb6a17fe02ff2726 (diff)
hurd: Clients or nested arbiters don't touch ioportsfeat-hurd-cleanup
-rw-r--r--src/hurd_pci.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/hurd_pci.c b/src/hurd_pci.c
index 2d10c5c..e7962a5 100644
--- a/src/hurd_pci.c
+++ b/src/hurd_pci.c
@@ -156,7 +156,6 @@ pci_system_hurd_destroy(void)
{
struct pci_system_hurd *pci_sys_hurd = (struct pci_system_hurd *)pci_sys;
- x86_disable_io();
mach_port_deallocate(mach_task_self(), pci_sys_hurd->root);
}
@@ -600,14 +599,14 @@ static const struct pci_system_methods hurd_pci_methods = {
.read = pci_device_hurd_read,
.write = pci_device_hurd_write,
.fill_capabilities = pci_fill_capabilities_generic,
- .open_legacy_io = pci_device_x86_open_legacy_io,
- .close_io = pci_device_x86_close_io,
- .read32 = pci_device_x86_read32,
- .read16 = pci_device_x86_read16,
- .read8 = pci_device_x86_read8,
- .write32 = pci_device_x86_write32,
- .write16 = pci_device_x86_write16,
- .write8 = pci_device_x86_write8,
+ .open_legacy_io = NULL,
+ .close_io = NULL,
+ .read32 = NULL,
+ .read16 = NULL,
+ .read8 = NULL,
+ .write32 = NULL,
+ .write16 = NULL,
+ .write8 = NULL,
.map_legacy = pci_device_hurd_map_legacy,
.unmap_legacy = pci_device_hurd_unmap_legacy,
};
@@ -639,10 +638,9 @@ pci_system_hurd_create(void)
*/
pci_sys_hurd = calloc(1, sizeof(struct pci_system_hurd));
- if (pci_sys_hurd == NULL) {
- x86_disable_io();
+ if (pci_sys_hurd == NULL)
return ENOMEM;
- }
+
pci_sys = &pci_sys_hurd->system;
pci_sys->methods = &hurd_pci_methods;