From 0ca35b4b5a8fc67b2222fa0981cb650f1b938f35 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sat, 17 Mar 2018 11:24:50 +0000
Subject: Removed separated configuration file for oslib.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11795 110e8d01-0319-4d1e-a829-52ad28d1bb01
---
 os/lib/include/chlib.h | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'os/lib/include')

diff --git a/os/lib/include/chlib.h b/os/lib/include/chlib.h
index caf3191ee..f398e1000 100644
--- a/os/lib/include/chlib.h
+++ b/os/lib/include/chlib.h
@@ -31,14 +31,6 @@
 #ifndef CHLIB_H
 #define CHLIB_H
 
-/* Tmeporary hack.*/
-#if !defined(_CHIBIOS_RT_CONF_VER_5_0_) && !defined(_CHIBIOS_NIL_CONF_VER_3_0_)
-#include "chlibconf.h"
-#else
-#define _CHIBIOS_LIB_CONF_
-#define _CHIBIOS_LIB_CONF_VER_1_0_
-#endif
-
 /*===========================================================================*/
 /* Module constants.                                                         */
 /*===========================================================================*/
@@ -96,6 +88,10 @@
 #error "malformed chlicense.h"
 #endif
 
+#if CH_CUSTOMER_LIC_LIB== FALSE
+#error "ChibiOS/LIB not licensed"
+#endif
+
 #if (CH_LICENSE_FEATURES != CH_FEATURES_FULL) &&                            \
     (CH_LICENSE_FEATURES != CH_FEATURES_INTERMEDIATE) &&                    \
     (CH_LICENSE_FEATURES != CH_FEATURES_BASIC)
@@ -135,14 +131,6 @@
           (CH_LICENSE_FEATURES == CH_FEATURES_BASIC) */
 
 /* Configuration file checks.*/
-#if !defined(_CHIBIOS_LIB_CONF_)
-#error "invalid configuration file"
-#endif
-
-#if !defined(_CHIBIOS_LIB_CONF_VER_1_0_)
-#error "obsolete or unknown configuration file"
-#endif
-
 #if !defined(CH_CFG_USE_SEMAPHORES)
 #error "CH_CFG_USE_SEMAPHORES not defined in chconf.h"
 #endif
-- 
cgit v1.2.3