--- a/packages/kernel/current/include/kapi.h
+++ b/packages/kernel/current/include/kapi.h
@@ -8,29 +8,38 @@
 //      Native API for Kernel
 //
 //==========================================================================
-//####COPYRIGHTBEGIN####
-//                                                                          
-// -------------------------------------------                              
-// The contents of this file are subject to the Red Hat eCos Public License 
-// Version 1.1 (the "License"); you may not use this file except in         
-// compliance with the License.  You may obtain a copy of the License at    
-// http://www.redhat.com/                                                   
-//                                                                          
-// Software distributed under the License is distributed on an "AS IS"      
-// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the 
-// License for the specific language governing rights and limitations under 
-// the License.                                                             
-//                                                                          
-// The Original Code is eCos - Embedded Configurable Operating System,      
-// released September 30, 1998.                                             
-//                                                                          
-// The Initial Developer of the Original Code is Red Hat.                   
-// Portions created by Red Hat are                                          
-// Copyright (C) 1998, 1999, 2000 Red Hat, Inc.                             
-// All Rights Reserved.                                                     
-// -------------------------------------------                              
-//                                                                          
-//####COPYRIGHTEND####
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+//
+// eCos 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 or (at your option) any later version.
+//
+// eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
 //==========================================================================
 //#####DESCRIPTIONBEGIN####
 //
@@ -118,7 +127,7 @@ typedef struct cyg_spinlock_t cyg_spinlo
 /* Scheduler operations */
 
 /* Starts scheduler with created threads.  Never returns. */
-void cyg_scheduler_start(void) __attribute__ ((noreturn));
+void cyg_scheduler_start(void) CYGBLD_ATTRIB_NORET;
 
 /* Lock and unlock the scheduler. When the scheduler is   */
 /* locked thread preemption is disabled.                  */
@@ -290,8 +299,10 @@ void cyg_interrupt_enable(void);
 
 /* Interrupt controller access                                               */
 void cyg_interrupt_mask(cyg_vector_t vector);
+void cyg_interrupt_mask_intunsafe(cyg_vector_t vector);
 
 void cyg_interrupt_unmask(cyg_vector_t vector);
+void cyg_interrupt_unmask_intunsafe(cyg_vector_t vector);
 
 void cyg_interrupt_acknowledge(cyg_vector_t vector);
 
@@ -332,6 +343,9 @@ void cyg_counter_set_value(
 /* Advance counter by one tick                                               */
 void cyg_counter_tick(cyg_handle_t counter);
 
+/* Advance counter by multiple ticks                                         */
+void cyg_counter_multi_tick(cyg_handle_t counter, cyg_tick_count_t ticks);
+
 
 #define CYG_RESOLUTION_T_MEMBERS  \
     cyg_uint32  dividend;         \
@@ -394,6 +408,12 @@ void cyg_alarm_initialize(
     cyg_tick_count_t    interval        /* Relative retrigger interval       */
 );
 
+void cyg_alarm_get_times(
+    cyg_handle_t        alarm,
+    cyg_tick_count_t    *trigger,       /* Next trigger time                 */
+    cyg_tick_count_t    *interval       /* Current interval                  */
+);
+
 void cyg_alarm_enable( cyg_handle_t alarm );
 
 void cyg_alarm_disable( cyg_handle_t alarm );