[pok-devel] [25] * kernel/core/sched.c

[subversion@xxxxxxxxxxxxx]

Revision: 25
Author:   julien
Date:     2011-12-05 21:09:13 +0100 (Mon, 05 Dec 2011)
Log Message:
-----------
 * kernel/core/sched.c
   - Fix compiling issue with GCC 4.6 (unused variable)

 * misc/release-files
   - Also release the OSADL case study

 * misc/conf-env.pl
   - Adapt Ocarina version number to the ESA supported version

 * examples/case-study-osadl11/software.aadl
   - misc changes, not relevant

Modified Paths:
--------------
    trunk/examples/case-study-osadl11/software.aadl
    trunk/kernel/core/sched.c
    trunk/misc/conf-env.pl
    trunk/misc/release-files

Modified: trunk/examples/case-study-osadl11/software.aadl
===================================================================
--- trunk/examples/case-study-osadl11/software.aadl	2011-10-25 09:42:36 UTC (rev 24)
+++ trunk/examples/case-study-osadl11/software.aadl	2011-12-05 20:09:13 UTC (rev 25)
@@ -1,3 +1,18 @@
+--
+--                              POK header
+-- 
+--  The following file is a part of the POK project. Any modification should
+--  be made according to the POK licence. You CANNOT use this file or a part 
+--  of a file for your own project.
+-- 
+--  For more information on the POK licence, please see our LICENCE FILE
+--
+--  Please follow the coding guidelines described in doc/CODING_GUIDELINES
+--
+--                                      Copyright (c) 2007-2011 POK team 
+--
+--  Created by julien on Sun Dec  4 20:23:07 2011 
+--
 package case_study_osal_software
 
 public

Modified: trunk/kernel/core/sched.c
===================================================================
--- trunk/kernel/core/sched.c	2011-10-25 09:42:36 UTC (rev 24)
+++ trunk/kernel/core/sched.c	2011-12-05 20:09:13 UTC (rev 25)
@@ -379,7 +379,9 @@
 uint32_t pok_sched_part_rms (const uint32_t index_low, const uint32_t index_high)
 {
    uint32_t res;
+#ifdef POK_NEEDS_DEBUG
    uint32_t from;
+#endif
 
    if (POK_SCHED_CURRENT_THREAD == IDLE_THREAD)
    {
@@ -390,7 +392,9 @@
       res = POK_SCHED_CURRENT_THREAD;
    }
 
+#ifdef POK_NEEDS_DEBUG
    from = res;
+#endif
 
    res= index_low;
 

Modified: trunk/misc/conf-env.pl
===================================================================
--- trunk/misc/conf-env.pl	2011-10-25 09:42:36 UTC (rev 24)
+++ trunk/misc/conf-env.pl	2011-12-05 20:09:13 UTC (rev 25)
@@ -18,7 +18,7 @@
 use Getopt::Long;
 
 my $OCARINA_VERSION = "2.0w";
-my $OCARINA_REVISION = 6995;
+my $OCARINA_REVISION = 3458;
 
 my $conf_file = "misc/mk/config.mk";
 my $use_floppy          = 0;

Modified: trunk/misc/release-files
===================================================================
--- trunk/misc/release-files	2011-10-25 09:42:36 UTC (rev 24)
+++ trunk/misc/release-files	2011-12-05 20:09:13 UTC (rev 25)
@@ -742,6 +742,14 @@
 examples/case-study-integrated/mfd_code.c
 examples/case-study-integrated/pcm_code.c
 examples/case-study-integrated/wam_code.c
+examples/case-study-osadl11/software.aadl
+examples/case-study-osadl11/send.c
+examples/case-study-osadl11/model.aadl
+examples/case-study-osadl11/model-distributed.aadl
+examples/case-study-osadl11/rtl8029.aadl
+examples/case-study-osadl11/receive.c
+examples/case-study-osadl11/runtime.aadl
+examples/case-study-osadl11/Makefile
 examples/partitions-scheduling/hello1.c
 examples/partitions-scheduling/hello2.c
 examples/partitions-scheduling/Makefile