ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/qdev: Rename qdev_connect_gpio_out*() 'input_pin' parameter 

@pin is an input where we connect a device output.
Rename it @input_pin to simplify the documentation.

Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211218130437.1516929-5-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2021-11-05 17:53:21 +01:00 committed by Philippe Mathieu-Daudé
parent 1fbd004b00
commit 2ebd9ce19a
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/core/gpio.c
View File

@ -115,17 +115,18 @@ qemu_irq qdev_get_gpio_in(DeviceState *dev, int n)
} }
void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n, void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n,
qemu_irq pin) qemu_irq input_pin)
{ {
char *propname = g_strdup_printf("%s[%d]", char *propname = g_strdup_printf("%s[%d]",
name ? name : "unnamed-gpio-out", n); name ? name : "unnamed-gpio-out", n);
if (pin && !OBJECT(pin)->parent) { if (input_pin && !OBJECT(input_pin)->parent) {
/* We need a name for object_property_set_link to work */ /* We need a name for object_property_set_link to work */
object_property_add_child(container_get(qdev_get_machine(), object_property_add_child(container_get(qdev_get_machine(),
"/unattached"), "/unattached"),
"non-qdev-gpio[*]", OBJECT(pin)); "non-qdev-gpio[*]", OBJECT(input_pin));
} }
object_property_set_link(OBJECT(dev), propname, OBJECT(pin), &error_abort); object_property_set_link(OBJECT(dev), propname,
OBJECT(input_pin), &error_abort);
g_free(propname); g_free(propname);
} }
@ -165,9 +166,9 @@ qemu_irq qdev_intercept_gpio_out(DeviceState *dev, qemu_irq icpt,
return disconnected; return disconnected;
} }
void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq pin) void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq input_pin)
{ {
qdev_connect_gpio_out_named(dev, NULL, n, pin); qdev_connect_gpio_out_named(dev, NULL, n, input_pin);
} }
void qdev_pass_gpios(DeviceState *dev, DeviceState *container, void qdev_pass_gpios(DeviceState *dev, DeviceState *container,

6
include/hw/qdev-core.h
View File

@ -476,7 +476,7 @@ qemu_irq qdev_get_gpio_in_named(DeviceState *dev, const char *name, int n);
* qdev_connect_gpio_out: Connect one of a device's anonymous output GPIO lines * qdev_connect_gpio_out: Connect one of a device's anonymous output GPIO lines
* @dev: Device whose GPIO to connect * @dev: Device whose GPIO to connect
* @n: Number of the anonymous output GPIO line (which must be in range) * @n: Number of the anonymous output GPIO line (which must be in range)
* @pin: qemu_irq to connect the output line to * @input_pin: qemu_irq to connect the output line to
* *
* This function connects an anonymous output GPIO line on a device * This function connects an anonymous output GPIO line on a device
* up to an arbitrary qemu_irq, so that when the device asserts that * up to an arbitrary qemu_irq, so that when the device asserts that
@ -509,7 +509,7 @@ void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq pin);
* @dev: Device whose GPIO to connect * @dev: Device whose GPIO to connect
* @name: Name of the output GPIO array * @name: Name of the output GPIO array
* @n: Number of the anonymous output GPIO line (which must be in range) * @n: Number of the anonymous output GPIO line (which must be in range)
* @pin: qemu_irq to connect the output line to * @input_pin: qemu_irq to connect the output line to
* *
* This function connects an anonymous output GPIO line on a device * This function connects an anonymous output GPIO line on a device
* up to an arbitrary qemu_irq, so that when the device asserts that * up to an arbitrary qemu_irq, so that when the device asserts that
@ -530,7 +530,7 @@ void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq pin);
* For anonymous output GPIO lines, use qdev_connect_gpio_out(). * For anonymous output GPIO lines, use qdev_connect_gpio_out().
*/ */
void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n, void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n,
qemu_irq pin); qemu_irq input_pin);
/** /**
* qdev_get_gpio_out_connector: Get the qemu_irq connected to an output GPIO * qdev_get_gpio_out_connector: Get the qemu_irq connected to an output GPIO