<p>Matt Delco has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27672">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">arch/x86/acpigen: refactor calls to acpigen_write_register<br><br>All of the callers to acpigen_write_register() also make calls to<br>acpigen_write_resourcetemplate_[header|footer](). This change introduces<br>acpigen_write_register_resource() to unify all of those trio of calls<br>into one.  I also made the input parameter const.<br><br>Change-Id: I10b336acf9f03c423bee9dc38955b1617e11c025<br>Signed-off-by: Matt Delco <delco@chromium.org><br>---<br>M src/arch/x86/acpigen.c<br>M src/arch/x86/include/arch/acpigen.h<br>2 files changed, 12 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/27672/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/x86/acpigen.c b/src/arch/x86/acpigen.c</span><br><span>index 732f749..a614efb 100644</span><br><span>--- a/src/arch/x86/acpigen.c</span><br><span>+++ b/src/arch/x86/acpigen.c</span><br><span>@@ -578,14 +578,10 @@</span><br><span>  acpigen_write_package(2);</span><br><span> </span><br><span>        /* ControlRegister */</span><br><span style="color: hsl(0, 100%, 40%);">-   acpigen_write_resourcetemplate_header();</span><br><span style="color: hsl(0, 100%, 40%);">-        acpigen_write_register(&addr);</span><br><span style="color: hsl(0, 100%, 40%);">-      acpigen_write_resourcetemplate_footer();</span><br><span style="color: hsl(120, 100%, 40%);">+      acpigen_write_register_resource(&addr);</span><br><span> </span><br><span>      /* StatusRegister */</span><br><span style="color: hsl(0, 100%, 40%);">-    acpigen_write_resourcetemplate_header();</span><br><span style="color: hsl(0, 100%, 40%);">-        acpigen_write_register(&addr);</span><br><span style="color: hsl(0, 100%, 40%);">-      acpigen_write_resourcetemplate_footer();</span><br><span style="color: hsl(120, 100%, 40%);">+      acpigen_write_register_resource(&addr);</span><br><span> </span><br><span>      acpigen_pop_len();</span><br><span> }</span><br><span>@@ -725,9 +721,7 @@</span><br><span> void acpigen_write_CST_package_entry(acpi_cstate_t *cstate)</span><br><span> {</span><br><span>    acpigen_write_package(4);</span><br><span style="color: hsl(0, 100%, 40%);">-       acpigen_write_resourcetemplate_header();</span><br><span style="color: hsl(0, 100%, 40%);">-        acpigen_write_register(&cstate->resource);</span><br><span style="color: hsl(0, 100%, 40%);">-       acpigen_write_resourcetemplate_footer();</span><br><span style="color: hsl(120, 100%, 40%);">+      acpigen_write_register_resource(&cstate->resource);</span><br><span>   acpigen_write_dword(cstate->ctype);</span><br><span>       acpigen_write_dword(cstate->latency);</span><br><span>     acpigen_write_dword(cstate->power);</span><br><span>@@ -827,7 +821,7 @@</span><br><span>         acpigen_emit_dword(size);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void acpigen_write_register(acpi_addr_t *addr)</span><br><span style="color: hsl(120, 100%, 40%);">+static void acpigen_write_register(const acpi_addr_t *addr)</span><br><span> {</span><br><span>   acpigen_emit_byte(0x82);                /* Register Descriptor */</span><br><span>    acpigen_emit_byte(0x0c);                /* Register Length 7:0 */</span><br><span>@@ -840,6 +834,13 @@</span><br><span>     acpigen_emit_dword(addr->addrh);     /* Register Address High */</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void acpigen_write_register_resource(const acpi_addr_t *addr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        acpigen_write_resourcetemplate_header();</span><br><span style="color: hsl(120, 100%, 40%);">+      acpigen_write_register(addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ acpigen_write_resourcetemplate_footer();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void acpigen_write_irq(u16 mask)</span><br><span> {</span><br><span>       /*</span><br><span>diff --git a/src/arch/x86/include/arch/acpigen.h b/src/arch/x86/include/arch/acpigen.h</span><br><span>index 52aa55b..042c797 100644</span><br><span>--- a/src/arch/x86/include/arch/acpigen.h</span><br><span>+++ b/src/arch/x86/include/arch/acpigen.h</span><br><span>@@ -228,7 +228,7 @@</span><br><span> void acpigen_write_TSD_package(u32 domain, u32 numprocs, PSD_coord coordtype);</span><br><span> void acpigen_write_mem32fixed(int readwrite, u32 base, u32 size);</span><br><span> void acpigen_write_io16(u16 min, u16 max, u8 align, u8 len, u8 decode16);</span><br><span style="color: hsl(0, 100%, 40%);">-void acpigen_write_register(acpi_addr_t *addr);</span><br><span style="color: hsl(120, 100%, 40%);">+void acpigen_write_register_resource(const acpi_addr_t *addr);</span><br><span> void acpigen_write_resourcetemplate_header(void);</span><br><span> void acpigen_write_resourcetemplate_footer(void);</span><br><span> void acpigen_write_mainboard_resource_template(void);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27672">change 27672</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27672"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I10b336acf9f03c423bee9dc38955b1617e11c025 </div>
<div style="display:none"> Gerrit-Change-Number: 27672 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt Delco <delco@chromium.org> </div>