Renames for consistency.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12564 110e8d01-0319-4d1e-a829-52ad28d1bb01

20 files changed, 15 insertions, 15 deletions

diff --git a/os/nil/nil.mk b/os/nil/nil.mk
index fa08333ce..69238e91e 100644
--- a/os/nil/nil.mk
+++ b/os/nil/nil.mk
@@ -26,4 +26,4 @@ ALLCSRC += $(KERNSRC)
 ALLINC  += $(KERNINC)

 

 # OS Library

-include $(CHIBIOS)/os/lib/lib.mk

+include $(CHIBIOS)/os/oslib/oslib.mk

diff --git a/os/lib/dox/lib.dox b/os/oslib/dox/lib.dox
index 4dfcdce58..4dfcdce58 100644
--- a/os/lib/dox/lib.dox
+++ b/os/oslib/dox/lib.dox
diff --git a/os/lib/include/chbsem.h b/os/oslib/include/chbsem.h
index 192aec86a..192aec86a 100644
--- a/os/lib/include/chbsem.h
+++ b/os/oslib/include/chbsem.h
diff --git a/os/lib/include/chfactory.h b/os/oslib/include/chfactory.h
index aaaa5d2c2..aaaa5d2c2 100644
--- a/os/lib/include/chfactory.h
+++ b/os/oslib/include/chfactory.h
diff --git a/os/lib/include/chlib.h b/os/oslib/include/chlib.h
index 495d03643..495d03643 100644
--- a/os/lib/include/chlib.h
+++ b/os/oslib/include/chlib.h
diff --git a/os/lib/include/chmboxes.h b/os/oslib/include/chmboxes.h
index fd76b995a..fd76b995a 100644
--- a/os/lib/include/chmboxes.h
+++ b/os/oslib/include/chmboxes.h
diff --git a/os/lib/include/chmemcore.h b/os/oslib/include/chmemcore.h
index b9b728389..b9b728389 100644
--- a/os/lib/include/chmemcore.h
+++ b/os/oslib/include/chmemcore.h
diff --git a/os/lib/include/chmemheaps.h b/os/oslib/include/chmemheaps.h
index f20969a32..f20969a32 100644
--- a/os/lib/include/chmemheaps.h
+++ b/os/oslib/include/chmemheaps.h
diff --git a/os/lib/include/chmempools.h b/os/oslib/include/chmempools.h
index 6e5a45277..6e5a45277 100644
--- a/os/lib/include/chmempools.h
+++ b/os/oslib/include/chmempools.h
diff --git a/os/lib/include/chobjfifos.h b/os/oslib/include/chobjfifos.h
index c75937eb7..c75937eb7 100644
--- a/os/lib/include/chobjfifos.h
+++ b/os/oslib/include/chobjfifos.h
diff --git a/os/lib/include/chpipes.h b/os/oslib/include/chpipes.h
index 8bf26c62b..8bf26c62b 100644
--- a/os/lib/include/chpipes.h
+++ b/os/oslib/include/chpipes.h
diff --git a/os/lib/lib.mk b/os/oslib/oslib.mk
index 7780318d2..6f837c0b2 100644
--- a/os/lib/lib.mk
+++ b/os/oslib/oslib.mk
@@ -15,34 +15,34 @@ CHLIBCONF := $(strip $(shell cat $(CHCONFDIR)/chconf.h | egrep -e "\#define"))
 

 LIBSRC :=

 ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHLIBCONF)),)

-LIBSRC += $(CHIBIOS)/os/lib/src/chmboxes.c

+LIBSRC += $(CHIBIOS)/os/oslib/src/chmboxes.c

 endif

 ifneq ($(findstring CH_CFG_USE_MEMCORE TRUE,$(CHLIBCONF)),)

-LIBSRC += $(CHIBIOS)/os/lib/src/chmemcore.c

+LIBSRC += $(CHIBIOS)/os/oslib/src/chmemcore.c

 endif

 ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHLIBCONF)),)

-LIBSRC += $(CHIBIOS)/os/lib/src/chmemheaps.c

+LIBSRC += $(CHIBIOS)/os/oslib/src/chmemheaps.c

 endif

 ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHLIBCONF)),)

-LIBSRC += $(CHIBIOS)/os/lib/src/chmempools.c

+LIBSRC += $(CHIBIOS)/os/oslib/src/chmempools.c

 endif

 ifneq ($(findstring CH_CFG_USE_PIPES TRUE,$(CHLIBCONF)),)

-LIBSRC += $(CHIBIOS)/os/lib/src/chpipes.c

+LIBSRC += $(CHIBIOS)/os/oslib/src/chpipes.c

 endif

 ifneq ($(findstring CH_CFG_USE_FACTORY TRUE,$(CHLIBCONF)),)

-LIBSRC += $(CHIBIOS)/os/lib/src/chfactory.c

+LIBSRC += $(CHIBIOS)/os/oslib/src/chfactory.c

 endif

 else

-LIBSRC := $(CHIBIOS)/os/lib/src/chmboxes.c \

-          $(CHIBIOS)/os/lib/src/chmemcore.c \

-          $(CHIBIOS)/os/lib/src/chmemheaps.c \

-          $(CHIBIOS)/os/lib/src/chmempools.c \

-          $(CHIBIOS)/os/lib/src/chpipes.c \

-          $(CHIBIOS)/os/lib/src/chfactory.c

+LIBSRC := $(CHIBIOS)/os/oslib/src/chmboxes.c \

+          $(CHIBIOS)/os/oslib/src/chmemcore.c \

+          $(CHIBIOS)/os/oslib/src/chmemheaps.c \

+          $(CHIBIOS)/os/oslib/src/chmempools.c \

+          $(CHIBIOS)/os/oslib/src/chpipes.c \

+          $(CHIBIOS)/os/oslib/src/chfactory.c

 endif

 

 # Required include directories

-LIBINC := $(CHIBIOS)/os/lib/include

+LIBINC := $(CHIBIOS)/os/oslib/include

 

 # Shared variables

 ALLCSRC += $(LIBSRC)

diff --git a/os/lib/readme.txt b/os/oslib/readme.txt
index d2e0e7222..d2e0e7222 100644
--- a/os/lib/readme.txt
+++ b/os/oslib/readme.txt
diff --git a/os/lib/src/chfactory.c b/os/oslib/src/chfactory.c
index b8d9bb07d..b8d9bb07d 100644
--- a/os/lib/src/chfactory.c
+++ b/os/oslib/src/chfactory.c
diff --git a/os/lib/src/chmboxes.c b/os/oslib/src/chmboxes.c
index 1b23bf2e0..1b23bf2e0 100644
--- a/os/lib/src/chmboxes.c
+++ b/os/oslib/src/chmboxes.c
diff --git a/os/lib/src/chmemcore.c b/os/oslib/src/chmemcore.c
index 5dc3ce446..5dc3ce446 100644
--- a/os/lib/src/chmemcore.c
+++ b/os/oslib/src/chmemcore.c
diff --git a/os/lib/src/chmemheaps.c b/os/oslib/src/chmemheaps.c
index a03bde2e7..a03bde2e7 100644
--- a/os/lib/src/chmemheaps.c
+++ b/os/oslib/src/chmemheaps.c
diff --git a/os/lib/src/chmempools.c b/os/oslib/src/chmempools.c
index 996b66329..996b66329 100644
--- a/os/lib/src/chmempools.c
+++ b/os/oslib/src/chmempools.c
diff --git a/os/lib/src/chpipes.c b/os/oslib/src/chpipes.c
index 6f6e8a30f..6f6e8a30f 100644
--- a/os/lib/src/chpipes.c
+++ b/os/oslib/src/chpipes.c
diff --git a/os/rt/rt.mk b/os/rt/rt.mk
index 14a4d3cc0..3294ce896 100644
--- a/os/rt/rt.mk
+++ b/os/rt/rt.mk
@@ -72,4 +72,4 @@ ALLCSRC += $(KERNSRC)
 ALLINC  += $(KERNINC)

 

 # OS Library

-include $(CHIBIOS)/os/lib/lib.mk

+include $(CHIBIOS)/os/oslib/oslib.mk