From 1981202f8c3e005f0504137204ddef70fcbc824c Mon Sep 17 00:00:00 2001 From: bernie Date: Tue, 16 Nov 2004 22:37:14 +0000 Subject: [PATCH] Replace IPTR with iptr_t. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@282 38d2e660-2303-0410-9eaa-f027e97ec537 --- drv/timer.h | 18 +++++------------- drv/timer_dsp56k.h | 7 +++++-- kern/proc.c | 7 +++++-- kern/proc.h | 7 +++++-- kern/proc_p.h | 5 ++++- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/drv/timer.h b/drv/timer.h index 924ee26c..bcf1ac9d 100755 --- a/drv/timer.h +++ b/drv/timer.h @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.17 2004/11/16 22:37:14 bernie + *#* Replace IPTR with iptr_t. + *#* *#* Revision 1.16 2004/08/25 14:12:08 rasky *#* Aggiornato il comment block dei log RCS *#* @@ -167,11 +170,6 @@ INLINE time_t timer_ticks(void) return result; } -DEPRECATED INLINE time_t timer_gettick(void) -{ - return timer_ticks(); -} - /*! * Faster version of timer_ticks(), to be called only when the timer @@ -185,18 +183,12 @@ INLINE time_t timer_ticks_unlocked(void) return _clock; } -DEPRECATED INLINE time_t timer_gettick_irq(void) -{ - return timer_ticks_unlocked(); -} - /*! * Return the minutes passed since timer start. * - * The minutes uptime is computed directly from system tick counter: - * in case of a 4 bytes time_t after 71582 minutes the value will - * wrap around. + * The uptime in minutes is computed directly from system tick counter. + * This value wraps around every 71582 minutes with a 32bit time_t. */ INLINE time_t timer_minutes(void) { diff --git a/drv/timer_dsp56k.h b/drv/timer_dsp56k.h index f0ff8843..42bd4b5f 100755 --- a/drv/timer_dsp56k.h +++ b/drv/timer_dsp56k.h @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.6 2004/11/16 22:37:14 bernie + *#* Replace IPTR with iptr_t. + *#* *#* Revision 1.5 2004/08/25 14:12:08 rasky *#* Aggiornato il comment block dei log RCS *#* @@ -54,7 +57,7 @@ //! Type of time expressed in ticks of the hardware high precision timer typedef uint16_t hptime_t; -static void system_timer_isr(UNUSED(IPTR, arg)); +static void system_timer_isr(UNUSED(iptr_t, arg)); static void timer_hw_init(void) { @@ -102,6 +105,6 @@ INLINE hptime_t timer_hw_hpread(void) } #define DEFINE_TIMER_ISR \ - static void system_timer_isr(UNUSED(IPTR, arg)) + static void system_timer_isr(UNUSED(iptr_t, arg)) #endif /* DRV_TIMER_DSP56_H */ diff --git a/kern/proc.c b/kern/proc.c index f61eab98..046108c9 100755 --- a/kern/proc.c +++ b/kern/proc.c @@ -17,6 +17,9 @@ /*#* *#* $Log$ + *#* Revision 1.20 2004/11/16 22:37:14 bernie + *#* Replace IPTR with iptr_t. + *#* *#* Revision 1.19 2004/10/19 11:47:39 bernie *#* Kill warnings when !CONFIG_PROC_MONITOR. *#* @@ -167,7 +170,7 @@ 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 data, size_t stacksize, cpustack_t *stack_base) +struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void), iptr_t data, size_t stacksize, cpustack_t *stack_base) { Process *proc; cpuflags_t flags; @@ -396,7 +399,7 @@ struct Process *proc_current(void) /*! * Get the pointer to the user data of the current process */ -IPTR proc_current_user_data(void) +iptr_t proc_current_user_data(void) { return CurrentProcess->user_data; } diff --git a/kern/proc.h b/kern/proc.h index a481fcbf..22942d4c 100755 --- a/kern/proc.h +++ b/kern/proc.h @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.8 2004/11/16 22:37:14 bernie + *#* Replace IPTR with iptr_t. + *#* *#* Revision 1.7 2004/10/19 08:54:55 bernie *#* Define forbid_cnt. *#* @@ -41,7 +44,7 @@ struct Process; /* Task scheduling services */ void proc_init(void); -struct Process *proc_new_with_name(const char* name, void (*entry)(void), IPTR data, size_t stacksize, cpustack_t *stack); +struct Process *proc_new_with_name(const char* name, void (*entry)(void), iptr_t data, size_t stacksize, cpustack_t *stack); #if !CONFIG_KERN_MONITOR #define proc_new(entry,data,size,stack) proc_new_with_name(NULL,(entry),(data),(size),(stack)) @@ -53,7 +56,7 @@ void proc_exit(void); void proc_switch(void); void proc_test(void); struct Process* proc_current(void); -IPTR proc_current_user_data(void); +iptr_t proc_current_user_data(void); void proc_rename(struct Process* proc, const char* name); #if CONFIG_KERN_PREEMPTIVE diff --git a/kern/proc_p.h b/kern/proc_p.h index 50ad1325..c4c93c74 100755 --- a/kern/proc_p.h +++ b/kern/proc_p.h @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.11 2004/11/16 22:37:14 bernie + *#* Replace IPTR with iptr_t. + *#* *#* Revision 1.10 2004/10/19 11:47:07 bernie *#* Add missing #endif. *#* @@ -72,7 +75,7 @@ typedef struct Process { Node link; /*!< Link Process into scheduler lists */ cpustack_t *stack; /*!< Per-process SP */ - IPTR user_data; /*!< Custom data passed to the process */ + iptr_t user_data; /*!< Custom data passed to the process */ #if CONFIG_KERN_SIGNALS sigset_t sig_wait; /*!< Signals the process is waiting for */ -- 2.25.1