diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2025-12-09 19:59:21 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2025-12-09 20:00:06 +0000 |
| commit | 575639548cef58590a1d70c29e47aae0e8d44153 (patch) | |
| tree | 8d9c9935a2619b8b25e22ebcf62c2d35cd297a3b /sys/powerpc/psim | |
| parent | 12165ac8407cef2c0b96035a1a956e3a7fe48cec (diff) | |
Diffstat (limited to 'sys/powerpc/psim')
| -rw-r--r-- | sys/powerpc/psim/ata_iobus.c | 12 | ||||
| -rw-r--r-- | sys/powerpc/psim/iobus.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/powerpc/psim/ata_iobus.c b/sys/powerpc/psim/ata_iobus.c index fff2cc659570..e9b48966779d 100644 --- a/sys/powerpc/psim/ata_iobus.c +++ b/sys/powerpc/psim/ata_iobus.c @@ -58,7 +58,7 @@ static int ata_iobus_attach(device_t dev); static int ata_iobus_probe(device_t dev); static int ata_iobus_print_child(device_t dev, device_t child); -struct resource *ata_iobus_alloc_resource(device_t, device_t, int, int *, +struct resource *ata_iobus_alloc_resource(device_t, device_t, int, int, rman_res_t, rman_res_t, rman_res_t, u_int); static int ata_iobus_release_resource(device_t, device_t, struct resource *); @@ -129,7 +129,7 @@ ata_iobus_print_child(device_t dev, device_t child) } struct resource * -ata_iobus_alloc_resource(device_t dev, device_t child, int type, int *rid, +ata_iobus_alloc_resource(device_t dev, device_t child, int type, int rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { @@ -152,14 +152,14 @@ ata_iobus_alloc_resource(device_t dev, device_t child, int type, int *rid, * The resource values are calculated from these registers */ if (type == SYS_RES_IOPORT) { - switch (*rid) { + switch (rid) { case ATA_IOADDR_RID: myrid = 0; start = ofw_regs[4]; end = start + ATA_IOSIZE - 1; count = ATA_IOSIZE; res = BUS_ALLOC_RESOURCE(device_get_parent(dev), child, - SYS_RES_MEMORY, &myrid, + SYS_RES_MEMORY, myrid, start, end, count, flags); break; @@ -169,7 +169,7 @@ ata_iobus_alloc_resource(device_t dev, device_t child, int type, int *rid, end = start + ATA_CTLIOSIZE - 1; count = ATA_CTLIOSIZE; res = BUS_ALLOC_RESOURCE(device_get_parent(dev), child, - SYS_RES_MEMORY, &myrid, + SYS_RES_MEMORY, myrid, start, end, count, flags); break; @@ -179,7 +179,7 @@ ata_iobus_alloc_resource(device_t dev, device_t child, int type, int *rid, } return (res); - } else if (type == SYS_RES_IRQ && *rid == ATA_IRQ_RID) { + } else if (type == SYS_RES_IRQ && rid == ATA_IRQ_RID) { /* * Pass this on to the parent */ diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c index 288d85effcc2..68f9a250fa2f 100644 --- a/sys/powerpc/psim/iobus.c +++ b/sys/powerpc/psim/iobus.c @@ -71,7 +71,7 @@ static void iobus_probe_nomatch(device_t, device_t); static int iobus_read_ivar(device_t, device_t, int, uintptr_t *); static int iobus_write_ivar(device_t, device_t, int, uintptr_t); static struct rman *iobus_get_rman(device_t, int, u_int); -static struct resource *iobus_alloc_resource(device_t, device_t, int, int *, +static struct resource *iobus_alloc_resource(device_t, device_t, int, int, rman_res_t, rman_res_t, rman_res_t, u_int); static int iobus_adjust_resource(device_t, device_t, struct resource *, @@ -319,7 +319,7 @@ iobus_get_rman(device_t bus, int type, u_int flags) } static struct resource * -iobus_alloc_resource(device_t bus, device_t child, int type, int *rid, +iobus_alloc_resource(device_t bus, device_t child, int type, int rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { |