Compilation fixes

Cacodemon345 · May 25, 2024 · 79385a7 · 79385a7
1 parent 8f3c7d7
commit 79385a7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/chipset/intel_piix.c b/src/chipset/intel_piix.c
@@ -1572,7 +1572,7 @@ piix_init(const device_t *info)
         sff_set_irq_mode(dev->bm[1], IRQ_MODE_MIRQ_0);
 
     if (dev->type >= 3) {
-        dev->usb   = device_add_parameters(&usb_device, &params);
+        dev->usb   = device_add_params(&usb_device, &params);
         uhci_register_usb(dev->usb);
     }
 

diff --git a/src/chipset/via_pipc.c b/src/chipset/via_pipc.c
@@ -1662,11 +1662,11 @@ pipc_init(const device_t *info)
         acpi_set_trap_update(dev->acpi, pipc_trap_update_586, dev);
     }
 
-    dev->usb[0] = device_add_inst_parameters(&usb_device, 1, &usb_params);
+    dev->usb[0] = device_add_inst_params(&usb_device, 1, &usb_params);
     uhci_register_usb(dev->usb[0]);
     if (dev->local >= VIA_PIPC_686A) {
         usb_params.pci_conf = &dev->usb_regs[1][0];
-        dev->usb[1] = device_add_inst_parameters(&usb_device, 2, &usb_params);
+        dev->usb[1] = device_add_inst_params(&usb_device, 2, &usb_params);
         uhci_register_usb(dev->usb[1]);
 
         dev->ac97 = device_add(&ac97_via_device);

diff --git a/src/usb.c b/src/usb.c
@@ -440,7 +440,7 @@ usb_close(void *priv)
 }
 
 static void *
-usb_init_ext(UNUSED(const device_t *info), void* params)
+usb_init(UNUSED(const device_t *info))
 {
     usb_t *dev;
 
@@ -462,7 +462,7 @@ usb_init_ext(UNUSED(const device_t *info), void* params)
                     ohci_mmio_read, NULL, NULL,
                     ohci_mmio_write, NULL, NULL,
                     NULL, MEM_MAPPING_EXTERNAL, dev);
-    dev->usb_uhci_priv = usb_uhci_init_ext(info, params);
+    dev->usb_uhci_priv = usb_uhci_init_ext(info, (void*)info->local);
     usb_reset(dev);
 
     return dev;
@@ -471,9 +471,9 @@ usb_init_ext(UNUSED(const device_t *info), void* params)
 const device_t usb_device = {
     .name          = "Universal Serial Bus",
     .internal_name = "usb",
-    .flags         = DEVICE_PCI | DEVICE_EXTPARAMS,
+    .flags         = DEVICE_PCI,
     .local         = 0,
-    { .init_ext      = usb_init_ext, },
+    { .init      = usb_init, },
     .close         = usb_close,
     .reset         = usb_reset,
     { .available = NULL },