conflicting types when building rtems-libbsd

[Joel Sherrill]

I added an <rtems/pci.h> to the pc386 <bsp.h> as part of my patch series.
This was the only bsp.h that included it. I decided the/ best solution was
that
no bsp.h should include rtems/pci.h.

I made a bspimpl.h and moved some of the private symbols to it.

Josh.. I pushed the patch to rtems git repo. Please update and retry this.

Gedare.. should it be bsp/bspimpl.h or just bspimpl.h? I did add it as
a nodist file.

--joel

On Tue, Mar 15, 2016 at 4:10 PM, Joel Sherrill <joel.sherrill at oarcorp.com>
wrote:

>
>
> On Tue, Mar 15, 2016 at 3:39 PM, Gedare Bloom <gedare at rtems.org> wrote:
>
>> Yeah, change this pci_ stuff in bsp to use an rtems safe namespace...
>>
>>
> I was hoping to add this to <rtems/pci.h> but all those start with pci_
> which would
> conflict. I suppose I could name it bsp_pci_find_device() but it is really
> portable
> code using just <rtems/pci.h> interfaces.
>
> Should I take the cheap path and add bsp_ or rename it entirely
> (pci_locate_device :)?
>
> --joel
>
>
> On Tue, Mar 15, 2016 at 3:41 PM, Josh O'Guin <Josh.OGuin at oarcorp.com>
>> wrote:
>> > From my understanding, Joel recently added pci_find_device to the RTEMS
>> > code.  It is now conflicting with the pci_find_device in libbsd when I
>> try
>> > to build.  Does anyone have any suggestions on resolving this problem?
>> Here
>> > is my output for details.  Thanks.
>> >
>> >
>> >
>> > [433/845] Compiling freebsd/sys/dev/sdhci/sdhci.c
>> >
>> > In file included from
>> >
>> /home/josh/development/rtems/bsps/4.12/i386-rtems4.12/pc386/lib/include/bsp.h:62:0,
>> >
>> >                  from ../../freebsd/sys/dev/sdhci/sdhci.c:62:
>> >
>> >
>> /home/josh/development/rtems/bsps/4.12/i386-rtems4.12/pc386/lib/include/rtems/pci.h:1234:1:
>> > error: conflicting types for 'pci_find_device'
>> >
>> > pci_find_device(
>> >
>> > ^~~~~~~~~~~~~~~
>> >
>> > In file included from ../../freebsd/sys/dev/sdhci/sdhci.c:45:0:
>> >
>> >
>> /home/josh/development/rtems/rtems-libbsd/freebsd/sys/dev/pci/pcivar.h:460:10:
>> > note: previous declaration of 'pci_find_device' was here
>> >
>> > device_t pci_find_device(uint16_t, uint16_t);
>> >
>> >           ^~~~~~~~~~~~~~~
>> >
>> >
>> >
>> > Waf: Leaving directory
>> > `/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386'
>> >
>> > Build failed
>> >
>> > -> task in 'bsd' failed (exit status 1):
>> >
>> >         {task 3070316204L: c sdhci.c -> sdhci.c.16.o}
>> >
>> > ['/home/josh/development/rtems/4.12/bin/i386-rtems4.12-gcc', '-qrtems',
>> > '-B/home/josh/development/rtems/bsps/4.12//i386-rtems4.12/lib/',
>> > '-B/home/josh/development/rtems/bsps/4.12//i386-rtems4.12/pc386/lib/',
>> > '--specs', 'bsp_specs', '-mtune=i386', '-mtune=i386',
>> '-ffunction-sections',
>> > '-ffunction-sections', '-fdata-sections', '-fdata-sections',
>> '-std=gnu11',
>> > '-O2', '-g', '-fno-strict-aliasing', '-ffreestanding', '-fno-common',
>> '-w',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/rtemsbsd/i386/include',
>> > '-I/home/josh/development/rtems/rtems-libbsd/rtemsbsd/i386/include',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/sys/i386/include',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/sys/i386/include',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/rtemsbsd/x86/include',
>> > '-I/home/josh/development/rtems/rtems-libbsd/rtemsbsd/x86/include',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/sys/x86/include',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/sys/x86/include',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/rtemsbsd/include',
>> > '-I/home/josh/development/rtems/rtems-libbsd/rtemsbsd/include',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/sys',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/sys',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/sys/contrib/altq',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/sys/contrib/altq',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/sys/contrib/pf',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/sys/contrib/pf',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/include',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/include',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libc/include',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libc/include',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libc/isc/include',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libc/isc/include',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libc/resolv',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libc/resolv',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libutil',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libutil',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libkvm',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libkvm',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libmemstat',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libmemstat',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/lib/libipsec',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/lib/libipsec',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/contrib/libpcap',
>> > '-I/home/josh/development/rtems/rtems-libbsd/freebsd/contrib/libpcap',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/rtemsbsd/sys',
>> > '-I/home/josh/development/rtems/rtems-libbsd/rtemsbsd/sys',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/mDNSResponder/mDNSCore',
>> > '-I/home/josh/development/rtems/rtems-libbsd/mDNSResponder/mDNSCore',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/mDNSResponder/mDNSShared',
>> > '-I/home/josh/development/rtems/rtems-libbsd/mDNSResponder/mDNSShared',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/mDNSResponder/mDNSPosix',
>> > '-I/home/josh/development/rtems/rtems-libbsd/mDNSResponder/mDNSPosix',
>> >
>> '-I/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/testsuite/include',
>> > '-I/home/josh/development/rtems/rtems-libbsd/testsuite/include',
>> > '-DHAVE_RTEMS_SCORE_CPUOPTS_H=1', '-DHAVE_RTEMS_H=1',
>> '-DHAVE_DLFCN_H=1',
>> > '-DHAVE_RTEMS_PCI_H=1', '../../freebsd/sys/dev/sdhci/sdhci.c', '-c',
>> '-o',
>> >
>> '/home/josh/development/rtems/rtems-libbsd/build/i386-rtems4.12-pc386/freebsd/sys/dev/sdhci/sdhci.c.16.o']
>> >
>> >
>> >
>> >
>> > _______________________________________________
>> > users mailing list
>> > users at rtems.org
>> > http://lists.rtems.org/mailman/listinfo/users
>> _______________________________________________
>> users mailing list
>> users at rtems.org
>> http://lists.rtems.org/mailman/listinfo/users
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/users/attachments/20160315/382e3f2b/attachment-0002.html>