X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fproc.h;h=cec57487775e56f9e6b5b60cc7334bada539b2c8;hb=f3ba158c1ebfcef6c85759056d0a3d5f421ea870;hp=d5866993a129372c105c3c267f4823355fa808c2;hpb=1cc167e20f21d2e81527ca47ccd4a21a6198f86f;p=bertos.git

diff --git a/kern/proc.h b/kern/proc.h
old mode 100755
new mode 100644
index d5866993..cec57487
--- 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>
- * All Rights Reserved.
+ *
  * -->
  *
  * \brief Process scheduler (public interface).
@@ -12,39 +37,49 @@
  *
  * \author Bernardo Innocenti <bernie@develer.com>
  */
-
-/*
- * $Log$
- * 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;
 
 /* Task scheduling services */
 void proc_init(void);
-struct Process *proc_new(void (*entry)(void), 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))
+#else
+	#define proc_new(entry,data,size,stack) proc_new_with_name(#entry,(entry),(data),(size),(stack))
+#endif
+
 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);
 
 #if CONFIG_KERN_PREEMPTIVE
-	#define	FORBID proc_forbid()
-	#define	PERMIT proc_permit()
+	void proc_forbid(void);
+	void proc_permit(void);
 #else
-	#define FORBID
-	#define PERMIT
+	INLINE void proc_forbid(void) { /* nop */ }
+	INLINE void proc_permit(void) { /* nop */ }
 #endif
 
-#endif /* KERN_PROC_H */
+/**
+ * Execute a block of \a CODE atomically with respect to task scheduling.
+ */
+#define PROC_ATOMIC(CODE) \
+	do { \
+		proc_forbid(); \
+		CODE; \
+		proc_permit(); \
+	} while(0)
 
+#endif /* KERN_PROC_H */