<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26993">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/drivers/{net,usb}: Use pci_devfn_t instead of device_t<br><br>Change-Id: I9091cf92b98409603dadfeb1e1ad274ca73f1ae9<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/drivers/net/ne2k.c<br>M src/drivers/usb/pci_ehci.c<br>2 files changed, 7 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/26993/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/drivers/net/ne2k.c b/src/drivers/net/ne2k.c</span><br><span>index 96f4d70..75f3357 100644</span><br><span>--- a/src/drivers/net/ne2k.c</span><br><span>+++ b/src/drivers/net/ne2k.c</span><br><span>@@ -273,7 +273,11 @@</span><br><span> </span><br><span> int ne2k_init(unsigned int eth_nic_base) {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   device_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __SIMPLE_DEVICE__</span><br><span style="color: hsl(120, 100%, 40%);">+       pci_devfn_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+       struct device *dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span>  unsigned char c;</span><br><span> </span><br><span>         /* Power management controller */</span><br><span>diff --git a/src/drivers/usb/pci_ehci.c b/src/drivers/usb/pci_ehci.c</span><br><span>index 3bdeeeb..2f529e9 100644</span><br><span>--- a/src/drivers/usb/pci_ehci.c</span><br><span>+++ b/src/drivers/usb/pci_ehci.c</span><br><span>@@ -37,7 +37,7 @@</span><br><span> #ifdef __SIMPLE_DEVICE__</span><br><span>       pci_devfn_t dev = dbg_dev;</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">-     device_t dev = dev_find_slot(PCI_DEV2SEGBUS(dbg_dev), PCI_DEV2DEVFN(dbg_dev));</span><br><span style="color: hsl(120, 100%, 40%);">+        struct device *dev = dev_find_slot(PCI_DEV2SEGBUS(dbg_dev), PCI_DEV2DEVFN(dbg_dev));</span><br><span> #endif</span><br><span> </span><br><span>   u32 class = pci_read_config32(dev, PCI_CLASS_REVISION) >> 8;</span><br><span>@@ -123,7 +123,7 @@</span><br><span> #ifdef __SIMPLE_DEVICE__</span><br><span>         u8 *base = (u8 *)(pci_read_config32(sdev, EHCI_BAR_INDEX) & ~0x0f);</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">-        device_t dev = dev_find_slot(PCI_DEV2SEGBUS(sdev), PCI_DEV2DEVFN(sdev));</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *dev = dev_find_slot(PCI_DEV2SEGBUS(sdev), PCI_DEV2DEVFN(sdev));</span><br><span>       u8 *base = (u8 *)(pci_read_config32(dev, EHCI_BAR_INDEX) & ~0x0f);</span><br><span> #endif</span><br><span>     return base + HC_LENGTH(read32(base));</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26993">change 26993</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/26993"/><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: I9091cf92b98409603dadfeb1e1ad274ca73f1ae9 </div>
<div style="display:none"> Gerrit-Change-Number: 26993 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>