diff options
author | Joel Sherrill <joel@rtems.org> | 2016-03-15 19:36:41 -0500 |
---|---|---|
committer | Joel Sherrill <joel@rtems.org> | 2016-03-15 19:37:58 -0500 |
commit | 364866db1f0df1fedcc7c24a953d5ebf4864e588 (patch) | |
tree | 35903e42f43dba34f5fa1a167acf19caa6cab6d6 /c/src | |
parent | atsamv-testsuite.tcfg: Add more tests (diff) | |
download | rtems-364866db1f0df1fedcc7c24a953d5ebf4864e588.tar.bz2 |
pc386: Do not include rtems/pci.h from bsp.h. Add bsp/bspimpl.h
Start to migrate private symbols to bsp/bspimpl.h.
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/Makefile.am | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/include/bsp.h | 17 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/preinstall.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/bspstart.c | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/shared/pci/pci_io.c | 17 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/shared/pci/pcibios.c | 6 |
6 files changed, 28 insertions, 18 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index f79148b048..d9af7dd5a7 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -25,6 +25,7 @@ noinst_PROGRAMS = SUBDIRS = . tools +nodist_include_bsp_HEADERS += include/bspimpl.h include_bsp_HEADERS = ../../i386/shared/irq/irq.h include_bsp_HEADERS += ../../i386/shared/irq/irq_asm.h include_bsp_HEADERS += ../../i386/shared/comm/tty_drv.h diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/c/src/lib/libbsp/i386/pc386/include/bsp.h index 9fb38587da..3d29e3ec18 100644 --- a/c/src/lib/libbsp/i386/pc386/include/bsp.h +++ b/c/src/lib/libbsp/i386/pc386/include/bsp.h @@ -59,7 +59,6 @@ #include <rtems/clockdrv.h> #include <rtems/score/cpu.h> #include <rtems/bspIo.h> -#include <rtems/pci.h> #ifdef __cplusplus extern "C" { @@ -276,22 +275,6 @@ uint32_t BSP_irq_count_dump(FILE *f); void raw_idt_notify(void); void C_dispatch_isr(int vector); -/* - * PCI Support Methods - */ -const pci_config_access_functions *pci_bios_initialize(void); -const pci_config_access_functions *pci_io_initialize(void); - -/* - * Helper to parse boot command line arguments related to the console driver - */ -void pc386_parse_console_arguments(void); - -/* - * Dynamically probe for PCI UARTS - */ -void pci_uart_probe(void); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/i386/pc386/preinstall.am b/c/src/lib/libbsp/i386/pc386/preinstall.am index 46b646727a..a8749a0b0e 100644 --- a/c/src/lib/libbsp/i386/pc386/preinstall.am +++ b/c/src/lib/libbsp/i386/pc386/preinstall.am @@ -53,6 +53,10 @@ $(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INC $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h +$(PROJECT_INCLUDE)/bsp/bspimpl.h: include/bspimpl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspimpl.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspimpl.h + $(PROJECT_INCLUDE)/bsp/irq.h: ../../i386/shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c index 34cff0b917..41f858b5d0 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c @@ -27,6 +27,7 @@ */ #include <bsp.h> +#include <bsp/bspimpl.h> #include <bsp/irq.h> #include <rtems/pci.h> #include <libcpu/cpuModel.h> diff --git a/c/src/lib/libbsp/i386/shared/pci/pci_io.c b/c/src/lib/libbsp/i386/shared/pci/pci_io.c index 5947c04388..b6cd1005f0 100644 --- a/c/src/lib/libbsp/i386/shared/pci/pci_io.c +++ b/c/src/lib/libbsp/i386/shared/pci/pci_io.c @@ -1,6 +1,21 @@ +/** + * @file + * + * PCI Support when Configuration Space is in I/O + */ + +/* + * COPYRIGHT (c) 2016. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. + */ + #include <rtems.h> -#include <rtems/pci.h> #include <bsp.h> +#include <bsp/bspimpl.h> static int pci_io_initialized = 0; diff --git a/c/src/lib/libbsp/i386/shared/pci/pcibios.c b/c/src/lib/libbsp/i386/shared/pci/pcibios.c index e74649413b..173c89f3f8 100644 --- a/c/src/lib/libbsp/i386/shared/pci/pcibios.c +++ b/c/src/lib/libbsp/i386/shared/pci/pcibios.c @@ -1,3 +1,9 @@ +/** + * @file + * + * PCI Support when Configuration Space is accessed via BIOS + */ + /* * This software is Copyright (C) 1998 by T.sqware - all rights limited * It is provided in to the public domain "as is", can be freely modified |