--- a/packages/hal/arm/at91/var/current/ChangeLog
+++ b/packages/hal/arm/at91/var/current/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-18  Daniel Néri  <daniel.neri@sigicom.se>
+
+	* cdl/hal_arm_at91.cdl: Define CYGNUM_HAL_ARM_AT91_CLOCK_SPEED with
+	a default_value so it can be overridden in the platform HAL.
+	* src/hal_diag.c (cyg_hal_plf_serial_control): Properly terminate
+	variable argument processing.
+	* include/hal_diag.h: prototype for hal_at91_set_leds() to avoid
+	compiler warning.
+	
 2004-02-12  Jani Monoses <jani@iv.ro>
 
 	* cdl/hal_arm_at91.cdl: Put configuration options common to all

--- a/packages/hal/arm/at91/var/current/cdl/hal_arm_at91.cdl
+++ b/packages/hal/arm/at91/var/current/cdl/hal_arm_at91.cdl
@@ -128,7 +128,7 @@ cdl_package CYGPKG_HAL_ARM_AT91 {
     cdl_option CYGNUM_HAL_ARM_AT91_CLOCK_SPEED {
         display       "CPU clock speed"
         flavor        data
-        calculated    {CYGHWR_HAL_ARM_AT91 == "R40008" ? 66000000: 32768000}
+        default_value {CYGHWR_HAL_ARM_AT91 == "R40008" ? 66000000 : 32768000}
     }
 
     cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS {

--- a/packages/hal/arm/at91/var/current/include/hal_diag.h
+++ b/packages/hal/arm/at91/var/current/include/hal_diag.h
@@ -68,6 +68,8 @@
 // LED
 externC void hal_diag_led(int mask);
 
+externC void hal_at91_set_leds(int mask);
+
 //-----------------------------------------------------------------------------
 // delay
 

--- a/packages/hal/arm/at91/var/current/src/hal_diag.c
+++ b/packages/hal/arm/at91/var/current/src/hal_diag.c
@@ -229,19 +229,13 @@ cyg_hal_plf_serial_control(void *__ch_da
         ret = chan->isr_vector;
         break;
     case __COMMCTL_SET_TIMEOUT:
-    {
-        va_list ap;
-
-        va_start(ap, __func);
-
         ret = chan->msec_timeout;
         chan->msec_timeout = va_arg(ap, cyg_uint32);
-
-        va_end(ap);
-    }        
     default:
         break;
     }
+
+    va_end(ap);
     CYGARC_HAL_RESTORE_GP();
     return ret;
 }