<div dir="ltr">I added an <rtems/pci.h> to the pc386 <bsp.h> as part of my patch series.<div>This was the only bsp.h that included it. I decided the/ best solution was that</div><div>no bsp.h should include rtems/pci.h.</div><div><br></div><div>I made a bspimpl.h and moved some of the private symbols to it.</div><div><br></div><div>Josh.. I pushed the patch to rtems git repo. Please update and retry this.</div><div><br></div><div>Gedare.. should it be bsp/bspimpl.h or just bspimpl.h? I did add it as</div><div>a nodist file.</div><div><br></div><div>--joel</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Mar 15, 2016 at 4:10 PM, Joel Sherrill <span dir="ltr"><<a href="mailto:joel.sherrill@oarcorp.com" target="_blank">joel.sherrill@oarcorp.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><span class="">On Tue, Mar 15, 2016 at 3:39 PM, Gedare Bloom <span dir="ltr"><<a href="mailto:gedare@rtems.org" target="_blank">gedare@rtems.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Yeah, change this pci_ stuff in bsp to use an rtems safe namespace...<br>
<div><div><br></div></div></blockquote><div><br></div></span><div>I was hoping to add this to <rtems/pci.h> but all those start with pci_ which would</div><div>conflict. I suppose I could name it bsp_pci_find_device() but it is really portable</div><div>code using just <rtems/pci.h> interfaces.</div><div> </div><div>Should I take the cheap path and add bsp_ or rename it entirely (pci_locate_device :)?</div><span class="HOEnZb"><font color="#888888"><div><br></div><div>--joel</div></font></span><div><div class="h5"><div><br></div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div>
On Tue, Mar 15, 2016 at 3:41 PM, Josh O'Guin <<a href="mailto:Josh.OGuin@oarcorp.com" target="_blank">Josh.OGuin@oarcorp.com</a>> wrote:<br>
> From my understanding, Joel recently added pci_find_device to the RTEMS<br>
> code. It is now conflicting with the pci_find_device in libbsd when I try<br>
> to build. Does anyone have any suggestions on resolving this problem? Here<br>
> is my output for details. Thanks.<br>
><br>
><br>
><br>
> [433/845] Compiling freebsd/sys/dev/sdhci/sdhci.c<br>
><br>
> In file included from<br>
> /home/josh/development/rtems/bsps/4.12/i386-rtems4.12/pc386/lib/include/bsp.h:62:0,<br>
><br>
> from ../../freebsd/sys/dev/sdhci/sdhci.c:62:<br>
><br>
> /home/josh/development/rtems/bsps/4.12/i386-rtems4.12/pc386/lib/include/rtems/pci.h:1234:1:<br>
> error: conflicting types for 'pci_find_device'<br>
><br>
> pci_find_device(<br>
><br>
> ^~~~~~~~~~~~~~~<br>
><br>
> In file included from ../../freebsd/sys/dev/sdhci/sdhci.c:45:0:<br>
><br>
> /home/josh/development/rtems/rtems-libbsd/freebsd/sys/dev/pci/pcivar.h:460:10:<br>
> note: previous declaration of 'pci_find_device' was here<br>
><br>
> device_t pci_find_device(uint16_t, uint16_t);<br>
><br>
> ^~~~~~~~~~~~~~~<br>
><br>
><br>
><br>
> Waf: Leaving directory<br>
> `/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386'<br>
><br>
> Build failed<br>
><br>
> -> task in 'bsd' failed (exit status 1):<br>
><br>
> {task 3070316204L: c sdhci.c -> sdhci.c.16.o}<br>
><br>
> ['/home/josh/development/rtems/4.12/bin/i386-rtems4.12-gcc', '-qrtems',<br>
> '-B/home/josh/development/rtems/bsps/4.12//i386-rtems4.12/lib/',<br>
> '-B/home/josh/development/rtems/bsps/4.12//i386-rtems4.12/pc386/lib/',<br>
> '--specs', 'bsp_specs', '-mtune=i386', '-mtune=i386', '-ffunction-sections',<br>
> '-ffunction-sections', '-fdata-sections', '-fdata-sections', '-std=gnu11',<br>
> '-O2', '-g', '-fno-strict-aliasing', '-ffreestanding', '-fno-common', '-w',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/rtemsbsd/i386/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/rtemsbsd/i386/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/sys/i386/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/sys/i386/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/rtemsbsd/x86/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/rtemsbsd/x86/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/sys/x86/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/sys/x86/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/rtemsbsd/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/rtemsbsd/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/sys',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/sys',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/sys/contrib/altq',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/sys/contrib/altq',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/sys/contrib/pf',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/sys/contrib/pf',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libc/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libc/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libc/isc/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libc/isc/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libc/resolv',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libc/resolv',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libutil',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libutil',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libkvm',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libkvm',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libmemstat',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libmemstat',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libipsec',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libipsec',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/contrib/libpcap',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/contrib/libpcap',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/rtemsbsd/sys',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/rtemsbsd/sys',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/mDNSResponder/mDNSCore',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/mDNSResponder/mDNSCore',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/mDNSResponder/mDNSShared',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/mDNSResponder/mDNSShared',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/mDNSResponder/mDNSPosix',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/mDNSResponder/mDNSPosix',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/testsuite/include',<br>
> '-I/home/josh/development/rtems/rtems-libbsd/testsuite/include',<br>
> '-DHAVE_RTEMS_SCORE_CPUOPTS_H=1', '-DHAVE_RTEMS_H=1', '-DHAVE_DLFCN_H=1',<br>
> '-DHAVE_RTEMS_PCI_H=1', '../../freebsd/sys/dev/sdhci/sdhci.c', '-c', '-o',<br>
> '/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/sys/dev/sdhci/sdhci.c.16.o']<br>
><br>
><br>
><br>
><br>
</div></div>> _______________________________________________<br>
> users mailing list<br>
> <a href="mailto:users@rtems.org" target="_blank">users@rtems.org</a><br>
> <a href="http://lists.rtems.org/mailman/listinfo/users" rel="noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/users</a><br>
_______________________________________________<br>
users mailing list<br>
<a href="mailto:users@rtems.org" target="_blank">users@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/users" rel="noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/users</a><br>
</blockquote></div></div></div><br></div></div>
</blockquote></div><br></div>