--- np2/i386c/ia32/task.h	2004/02/20 16:09:04	1.5
+++ np2/i386c/ia32/task.h	2011/12/29 13:32:12	1.10
@@ -1,5 +1,3 @@
-/*	$Id: task.h,v 1.5 2004/02/20 16:09:04 monaka Exp $	*/
-
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -12,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -34,20 +30,19 @@
 extern "C" {
 #endif
 
-void load_tr(UINT16 selector);
-void get_stack_pointer_from_tss(UINT pl, UINT16 *new_ss, UINT32 *new_esp);
+void CPUCALL load_tr(UINT16 selector);
+void CPUCALL get_stack_pointer_from_tss(UINT pl, UINT16 *new_ss, UINT32 *new_esp);
 UINT16 get_backlink_selector_from_tss(void);
 
 /* task_switch type */
-enum task_switch_type {
+typedef enum {
 	TASK_SWITCH_JMP,
 	TASK_SWITCH_CALL,
 	TASK_SWITCH_IRET,
-	TASK_SWITCH_INTR,
-};
-typedef enum task_switch_type task_switch_type_t;
+	TASK_SWITCH_INTR
+} task_switch_type_t;
 
-void task_switch(selector_t *selector, task_switch_type_t type);
+void CPUCALL task_switch(selector_t *selector, task_switch_type_t type);
 
 #ifdef __cplusplus
 }