| Message ID | 1447680189-2128-6-git-send-email-shannon.zhao@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Mon, 16 Nov 2015 21:23:06 +0800 shannon.zhao@linaro.org wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> s/ hw/acpi/aml-build: Add a wrapper for GPIO Interrupt Connection / acpi: add aml_gpio_int() wrapper / > > Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > Tested-by: Wei Huang <wei@redhat.com> > --- > hw/acpi/aml-build.c | 18 ++++++++++++++++++ > include/hw/acpi/aml-build.h | 6 ++++++ > 2 files changed, 24 insertions(+) > > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index 60d4703..8e18b22 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -626,6 +626,24 @@ static Aml *aml_gpio_connection(AmlGpioConnectionType type, > } > > /* > + * ACPI 5.0: 19.5.53 > + * GpioInt(GPIO Interrupt Connection Resource Descriptor Macro) > + */ > +Aml *aml_gpio_int(AmlConsumerAndProducer con_and_pro, > + AmlLevelAndEdge level_and_edge, to be closer to GpioInt descrition in spec: s/level_and_edge/edge_level/ > + AmlActiveHighAndLow high_and_low, AmlShared shared, s/high_and_low/active_level/ > + AmlPinConfig pin_cfg, int16_t debounce_timeout, s/pin_cfg/pin_config/ > + int32_t pin_num[], int32_t pin_count, const char *name, s/pin_num/pin_list/ s/name/resource_source{_name}/ > + const char *vendor_data) > +{ > + uint8_t flags = level_and_edge | (high_and_low << 1) | (shared << 3); > + > + return aml_gpio_connection(AML_INTERRUPT_CONNECTION, con_and_pro, flags, > + pin_cfg, 0, debounce_timeout, pin_num, pin_count, > + name, vendor_data); > +} > + > +/* > * ACPI 1.0b: 6.4.3.4 32-Bit Fixed Location Memory Range Descriptor > * (Type 1, Large Item Name 0x6) > */ > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > index 4e88882..bce813b 100644 > --- a/include/hw/acpi/aml-build.h > +++ b/include/hw/acpi/aml-build.h > @@ -232,6 +232,12 @@ Aml *aml_call1(const char *method, Aml *arg1); > Aml *aml_call2(const char *method, Aml *arg1, Aml *arg2); > Aml *aml_call3(const char *method, Aml *arg1, Aml *arg2, Aml *arg3); > Aml *aml_call4(const char *method, Aml *arg1, Aml *arg2, Aml *arg3, Aml *arg4); > +Aml *aml_gpio_int(AmlConsumerAndProducer con_and_pro, > + AmlLevelAndEdge level_and_edge, > + AmlActiveHighAndLow high_and_low, AmlShared shared, > + AmlPinConfig pin_cfg, int16_t debounce_timeout, > + int32_t pin_num[], int32_t pin_count, const char *name, > + const char *vendor_data); > Aml *aml_memory32_fixed(uint32_t addr, uint32_t size, > AmlReadAndWrite read_and_write); > Aml *aml_interrupt(AmlConsumerAndProducer con_and_pro,
On Mon, 16 Nov 2015 21:23:06 +0800 shannon.zhao@linaro.org wrote: [...] > + * ACPI 5.0: 19.5.53 > + * GpioInt(GPIO Interrupt Connection Resource Descriptor Macro) > + */ > +Aml *aml_gpio_int(AmlConsumerAndProducer con_and_pro, > + AmlLevelAndEdge level_and_edge, > + AmlActiveHighAndLow high_and_low, AmlShared shared, > + AmlPinConfig pin_cfg, int16_t debounce_timeout, > + int32_t pin_num[], int32_t pin_count, const char *name, also we never going to change pin_num[], so could be const [...]
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 60d4703..8e18b22 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -626,6 +626,24 @@ static Aml *aml_gpio_connection(AmlGpioConnectionType type, } /* + * ACPI 5.0: 19.5.53 + * GpioInt(GPIO Interrupt Connection Resource Descriptor Macro) + */ +Aml *aml_gpio_int(AmlConsumerAndProducer con_and_pro, + AmlLevelAndEdge level_and_edge, + AmlActiveHighAndLow high_and_low, AmlShared shared, + AmlPinConfig pin_cfg, int16_t debounce_timeout, + int32_t pin_num[], int32_t pin_count, const char *name, + const char *vendor_data) +{ + uint8_t flags = level_and_edge | (high_and_low << 1) | (shared << 3); + + return aml_gpio_connection(AML_INTERRUPT_CONNECTION, con_and_pro, flags, + pin_cfg, 0, debounce_timeout, pin_num, pin_count, + name, vendor_data); +} + +/* * ACPI 1.0b: 6.4.3.4 32-Bit Fixed Location Memory Range Descriptor * (Type 1, Large Item Name 0x6) */ diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 4e88882..bce813b 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -232,6 +232,12 @@ Aml *aml_call1(const char *method, Aml *arg1); Aml *aml_call2(const char *method, Aml *arg1, Aml *arg2); Aml *aml_call3(const char *method, Aml *arg1, Aml *arg2, Aml *arg3); Aml *aml_call4(const char *method, Aml *arg1, Aml *arg2, Aml *arg3, Aml *arg4); +Aml *aml_gpio_int(AmlConsumerAndProducer con_and_pro, + AmlLevelAndEdge level_and_edge, + AmlActiveHighAndLow high_and_low, AmlShared shared, + AmlPinConfig pin_cfg, int16_t debounce_timeout, + int32_t pin_num[], int32_t pin_count, const char *name, + const char *vendor_data); Aml *aml_memory32_fixed(uint32_t addr, uint32_t size, AmlReadAndWrite read_and_write); Aml *aml_interrupt(AmlConsumerAndProducer con_and_pro,