Merge needed define.

[bertos.git] / kern / proc.h

diff --git a/kern/proc.h b/kern/proc.h
old mode 100755 (executable)
new mode 100644 (file)
index 22942d4..cec5748
--- a/kern/proc.h
+++ b/kern/proc.h
@@ -1,9 +1,34 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2001,2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999,2000,2001 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ *
  * -->
  *
  * \brief Process scheduler (public interface).
@@ -12,32 +37,12 @@
  *
  * \author Bernardo Innocenti <bernie@develer.com>
  */
-
-/*#*
- *#* $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.
- *#*
- *#* Revision 1.6  2004/10/03 20:44:18  bernie
- *#* Remove stale declarations (moved to monitor.h).
- *#*
- *#* Revision 1.2  2004/06/03 11:27:09  bernie
- *#* Add dual-license information.
- *#*
- *#* Revision 1.1  2004/05/23 17:27:00  bernie
- *#* Import kern/ subdirectory.
- *#*
- *#*/
-
 #ifndef KERN_PROC_H
 #define KERN_PROC_H
 
-#include "compiler.h"
-#include "cpu.h"
-#include "config_kern.h"
+#include <cfg/compiler.h>
+#include <cpu/irq.h>
+#include <config_kern.h>
 
 /* Fwd decl */
 struct Process;
@@ -55,9 +60,9 @@ struct Process *proc_new_with_name(const char* name, void (*entry)(void), iptr_t
 void proc_exit(void);
 void proc_switch(void);
 void proc_test(void);
-struct Process* proc_current(void);
+struct Process *proc_current(void);
 iptr_t proc_current_user_data(void);
-void proc_rename(struct Process* proc, const char* name);
+void proc_rename(struct Process *proc, const char* name);
 
 #if CONFIG_KERN_PREEMPTIVE
        void proc_forbid(void);
@@ -67,7 +72,7 @@ void proc_rename(struct Process* proc, const char* name);
        INLINE void proc_permit(void) { /* nop */ }
 #endif
 
-/*!
+/**
  * Execute a block of \a CODE atomically with respect to task scheduling.
  */
 #define PROC_ATOMIC(CODE) \
@@ -78,4 +83,3 @@ void proc_rename(struct Process* proc, const char* name);
        } while(0)
 
 #endif /* KERN_PROC_H */
-