diff options
| author | Daniel Hellstrom <daniel@gaisler.com> | 2015-04-13 11:31:53 +0200 |
|---|---|---|
| committer | Daniel Hellstrom <daniel@gaisler.com> | 2015-04-17 01:10:30 +0200 |
| commit | bef5e23ef6b36accd189ea306f53d876a43d20f4 (patch) | |
| tree | 6dc4d1d5f804fc901c351e279d34d673a10d5409 | |
| parent | DRVMGR: KEY_TYPE now a enum drvmgr_kt (diff) | |
| download | rtems-bef5e23ef6b36accd189ea306f53d876a43d20f4.tar.bz2 | |
DRVMGR: renamed RES_EMPTY to DRVMGR_RES_EMPTY
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/amba/amba.c | 2 | ||||
| -rw-r--r-- | cpukit/libdrvmgr/drvmgr.h | 2 | ||||
| -rw-r--r-- | cpukit/libpci/pci_bus.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c b/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c index 260c57f57b..2e41b72ec4 100644 --- a/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c +++ b/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c @@ -61,7 +61,7 @@ struct drvmgr_bus_res leon2_amba_res __attribute__((weak)) = { .next = NULL, .resource = { - RES_EMPTY + DRVMGR_RES_EMPTY }, }; diff --git a/c/src/lib/libbsp/sparc/leon3/amba/amba.c b/c/src/lib/libbsp/sparc/leon3/amba/amba.c index fe481f5dd2..87dcf22f00 100644 --- a/c/src/lib/libbsp/sparc/leon3/amba/amba.c +++ b/c/src/lib/libbsp/sparc/leon3/amba/amba.c @@ -54,7 +54,7 @@ struct drvmgr_bus_res grlib_drv_resources __attribute__((weak)) = .next = NULL, .resource = { - RES_EMPTY, + DRVMGR_RES_EMPTY, } }; diff --git a/cpukit/libdrvmgr/drvmgr.h b/cpukit/libdrvmgr/drvmgr.h index 1f5bc80eb8..9e491f8dd5 100644 --- a/cpukit/libdrvmgr/drvmgr.h +++ b/cpukit/libdrvmgr/drvmgr.h @@ -179,7 +179,7 @@ enum drvmgr_kt { }; #define DRVMGR_KEY_EMPTY {NULL, DRVMGR_KT_NONE, {0}} -#define RES_EMPTY {0, 0, NULL} +#define DRVMGR_RES_EMPTY {0, 0, NULL} #define MMAP_EMPTY {0, 0, 0} /*! Union of different values */ diff --git a/cpukit/libpci/pci_bus.c b/cpukit/libpci/pci_bus.c index 7c2f18bf04..2172e720bd 100644 --- a/cpukit/libpci/pci_bus.c +++ b/cpukit/libpci/pci_bus.c @@ -115,7 +115,7 @@ struct drvmgr_func pcibus_funcs[] = { struct drvmgr_bus_res pcibus_drv_resources __attribute__((weak)) = { .next = NULL, .resource = { - RES_EMPTY, + DRVMGR_RES_EMPTY, }, }; |