Remove plenty of legacy names marked as OBSOLETE

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1696 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cfg/cfg_kern.h b/bertos/cfg/cfg_kern.h
index eae0ef741bfd9e1b479c2366b1ff8ca8b72a131a..e828bce7009a46a7af95ca2ced6cdc8f1fe2f6a5 100644 (file)
--- a/bertos/cfg/cfg_kern.h
+++ b/bertos/cfg/cfg_kern.h
@@ -67,7 +67,4 @@
 /// Module logging format.
 #define KERN_LOG_FORMAT     LOG_FMT_VERBOSE
 
-#define CONFIG_KERN_PREEMPTIVE CONFIG_KERN_PREEMPT // OBSOLETE
-#define CONFIG_KERNEL CONFIG_KERN // OBSOLETE
-
 #endif /*  CFG_KERN_H */

diff --git a/bertos/cfg/compiler.h b/bertos/cfg/compiler.h
index 052565cfa7175110dcbf1bd108cadb44e5600aec..7357f43f69789bdb380192795a18e5fc59121c6e 100644 (file)
--- a/bertos/cfg/compiler.h
+++ b/bertos/cfg/compiler.h
@@ -283,7 +283,6 @@
 #ifndef UNUSED_ARG
 #define UNUSED_ARG(type,arg)   type arg
 #endif
-#define UNUSED                 UNUSED_ARG /* OBSOLETE */
 #ifndef UNUSED_VAR
 #define UNUSED_VAR(type,name)  type name
 #endif

diff --git a/bertos/cfg/log.h b/bertos/cfg/log.h
index f490669265d4c6d5b3344ebc1b51b431e10dcc74..84d5cc637f195da4bb9781c58545d1da17e67d5e 100644 (file)
--- a/bertos/cfg/log.h
+++ b/bertos/cfg/log.h
@@ -132,9 +132,6 @@
 #define LOG_FMT_TERSE     0
 /* \} */
 
-#define LOG_SILENT    LOG_FMT_TERSE   /* OBSOLETE */
-#define LOG_VERBOSE   LOG_FMT_VERBOSE /* OBSOLETE */
-
 #if LOG_FORMAT == LOG_FMT_VERBOSE
        #define LOG_PRINT(str_level, str,...)    kprintf("%s():%d:%s: " str, __func__, __LINE__, str_level, ## __VA_ARGS__)
 #elif LOG_FORMAT == LOG_FMT_TERSE

diff --git a/bertos/cfg/macros.h b/bertos/cfg/macros.h
index 638118b54f4bdff3b8490a57108d9db5941ccfb5..69c404851c14b107709b3e7f8e3bfe6ac66049dc 100644 (file)
--- a/bertos/cfg/macros.h
+++ b/bertos/cfg/macros.h
@@ -166,9 +166,6 @@
 /** Round up \a x to an even multiple of the 2's power \a pad. */
 #define ROUND_UP2(x, pad) (((x) + ((pad) - 1)) & ~((pad) - 1))
 
-/* OBSOLETE */
-#define ROUND2 ROUND_UP2
-
 /**
  * \name Integer round macros.
  *

diff --git a/bertos/cpu/irq.h b/bertos/cpu/irq.h
index 22d11e1fbedb1ae23514f4ffde30a6c6804b0fc3..0d0d46861646dda34877b8971b16f0fc103b5573 100644 (file)
--- a/bertos/cpu/irq.h
+++ b/bertos/cpu/irq.h
@@ -252,10 +252,6 @@
        #define IRQ_ASSERT_DISABLED() do {} while(0)
 #endif
 
-// OBSOLETE names
-#define ASSERT_IRQ_ENABLED()  IRQ_ASSERT_ENABLED()
-#define ASSERT_IRQ_DISABLED() IRQ_ASSERT_DISABLED()
-
 /**
  * Execute \a CODE atomically with respect to interrupts.
  *
@@ -269,6 +265,4 @@
                IRQ_RESTORE(__flags); \
        } while (0)
 
-
-
 #endif /* CPU_IRQ_H */

diff --git a/bertos/cpu/power.h b/bertos/cpu/power.h
index 035495d47811aa1016bf2f41d56dd36046b04813..b4550ad6d0b4ba64f8d5b05dfca8113d65799670 100644 (file)
--- a/bertos/cpu/power.h
+++ b/bertos/cpu/power.h
@@ -40,7 +40,7 @@
 #include <cfg/cfg_kern.h>
 #include <cfg/cfg_wdt.h>
 
-#if CONFIG_KERNEL
+#if CONFIG_KERN
        #include <kern/proc.h>
 #endif
 
@@ -66,7 +66,7 @@
  */
 INLINE void cpu_relax(void)
 {
-#if CONFIG_KERNEL
+#if CONFIG_KERN
        proc_yield();
 #endif
 

diff --git a/bertos/drv/buzzer.c b/bertos/drv/buzzer.c
index 86e1c01ce2d50774813cc619f59fdb1c3ac8f3df..8cac8123ed3493fe0630834aa44ed44eec015f39 100644 (file)
--- a/bertos/drv/buzzer.c
+++ b/bertos/drv/buzzer.c
@@ -155,7 +155,7 @@ void buz_init(void)
        BUZZER_HW_INIT;
 
        /* Init software interrupt. */
-       timer_set_event_softint(&buz_timer, (Hook)buz_softint, 0);
+       timer_setSoftint(&buz_timer, (Hook)buz_softint, 0);
 
        MOD_INIT(buzzer);
 }

diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c
index c0106d85bbe515a32747c977e1ced7e48016b5e8..285d67c55e1242bfd772e0f2602c1637424a68e2 100644 (file)
--- a/bertos/drv/timer.c
+++ b/bertos/drv/timer.c
@@ -63,8 +63,8 @@
 /*
  * Sanity check for config parameters required by this module.
  */
-#if !defined(CONFIG_KERNEL) || ((CONFIG_KERNEL != 0) && CONFIG_KERNEL != 1)
-       #error CONFIG_KERNEL must be set to either 0 or 1 in config.h
+#if !defined(CONFIG_KERN) || ((CONFIG_KERN != 0) && CONFIG_KERN != 1)
+       #error CONFIG_KERN must be set to either 0 or 1 in config.h
 #endif
 #if !defined(CONFIG_WATCHDOG) || ((CONFIG_WATCHDOG != 0) && CONFIG_WATCHDOG != 1)
        #error CONFIG_WATCHDOG must be set to either 0 or 1 in config.h
@@ -74,12 +74,10 @@
        #include <drv/wdt.h>
 #endif
 
-#if CONFIG_KERNEL
-       #if CONFIG_KERN_SIGNALS
-               #include <kern/signal.h> /* sig_wait(), sig_check() */
-               #include <kern/proc.h>   /* proc_current() */
-               #include <cfg/macros.h>  /* BV() */
-       #endif
+#if defined (CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
+       #include <kern/signal.h> /* sig_wait(), sig_check() */
+       #include <kern/proc.h>   /* proc_current() */
+       #include <cfg/macros.h>  /* BV() */
 #endif
 
 
@@ -182,7 +180,7 @@ Timer *timer_abort(Timer *timer)
 void timer_delayTicks(ticks_t delay)
 {
        /* We shouldn't sleep with interrupts disabled */
-       ASSERT_IRQ_ENABLED();
+       IRQ_ASSERT_ENABLED();
 
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
        Timer t;

diff --git a/bertos/drv/timer.h b/bertos/drv/timer.h
index 6ae1907e6863ca5b2e182b694811e5a1eaab25c0..9e3e2b30f282d47944d0a24ed524d81e5e177973 100644 (file)
--- a/bertos/drv/timer.h
+++ b/bertos/drv/timer.h
@@ -249,12 +249,9 @@ Timer *timer_abort(Timer *timer);
 /** Set the timer so that it calls an user hook when it expires */
 INLINE void timer_setSoftint(Timer *timer, Hook func, iptr_t user_data)
 {
-       event_initSoftInt(&timer->expire, func, user_data);
+       event_initSoftint(&timer->expire, func, user_data);
 }
 
-// OBSOLETE
-#define  timer_set_event_softint timer_setSoftint
-
 /** Set the timer delay (the time before the event will be triggered) */
 INLINE void timer_setDelay(Timer *timer, ticks_t delay)
 {

diff --git a/bertos/kern/idle.c b/bertos/kern/idle.c
index 116328ecf7fd54452e9b6c4a2a03ee63f425de34..ecbe5915ca48903a55cc8ac30081aefd1f0352e5 100644 (file)
--- a/bertos/kern/idle.c
+++ b/bertos/kern/idle.c
@@ -40,7 +40,7 @@
 #include <cfg/module.h>
 
 
-static cpustack_t idle_stack[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)];
+static cpustack_t idle_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpustack_t)];
 
 /**
  * The idle process

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index 6bd5fdf417ed1469a989aa8ac0539ec8c70373d2..577f0db43e2d8a6925b55e09229c5461d69a715d 100644 (file)
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -148,10 +148,10 @@ void proc_init(void)
  * \return Process structure of new created process
  *         if successful, NULL otherwise.
  */
-struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpustack_t *stack_base)
+struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpustack_t *stack_base)
 {
        Process *proc;
-       const size_t PROC_SIZE_WORDS = ROUND2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
+       const size_t PROC_SIZE_WORDS = ROUND_UP2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
 #if CONFIG_KERN_HEAP
        bool free_stack = false;
 #endif

diff --git a/bertos/kern/proc.h b/bertos/kern/proc.h
index 6a4aff8be5dc8ff9eb9284de283ff75eb15cd159..6f1a8af5be69c463a860e760fcebb53f31b835fb 100644 (file)
--- a/bertos/kern/proc.h
+++ b/bertos/kern/proc.h
@@ -65,7 +65,6 @@ struct Process *proc_new_with_name(const char* name, void (*entry)(void), iptr_t
 
 void proc_exit(void);
 void proc_yield(void);
-#define proc_switch proc_yield /* OBSOLETE */
 
 int proc_testSetup(void);
 int proc_testRun(void);
@@ -188,8 +187,6 @@ INLINE void proc_permit(void)
        #endif
 #endif
 
-#define CONFIG_PROC_DEFSTACKSIZE CONFIG_KERN_MINSTACKSIZE // OBSOLETE
-
 /* Memory fill codes to help debugging */
 #if CONFIG_KERN_MONITOR
        #include <cpu/types.h>

diff --git a/bertos/kern/proc_test.c b/bertos/kern/proc_test.c
index 32fde7e0e26ea8e2c7291ae0411ad381d47677ab..414f2115f5213dc28dd49577ea0798f4e2c8a983 100644 (file)
--- a/bertos/kern/proc_test.c
+++ b/bertos/kern/proc_test.c
@@ -66,8 +66,8 @@ static void proc_test2(void)
        }
 }
 
-static cpustack_t proc_test1_stack[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)];
-static cpustack_t proc_test2_stack[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)];
+static cpustack_t proc_test1_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpustack_t)];
+static cpustack_t proc_test2_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpustack_t)];
 
 
 /**