X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS-Plus%2FSource%2FFreeRTOS-Plus-FAT-SL%2Fpsp%2Ftarget%2Ffat_sl%2Fpsp_test.h;h=15e632f2a6532b0f3fa6aa1c46c156b286025331;hb=ebb6034a688618794ec9004dc9b9f428a88babc2;hp=630c60f419d8164f499c27fb948d8b82fe1d867d;hpb=6bfaa1e9fe6bdfb24fa1cb3b875e9a54bb872bee;p=freertos

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/fat_sl/psp_test.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/fat_sl/psp_test.h
index 630c60f41..15e632f2a 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/fat_sl/psp_test.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-FAT-SL/psp/target/fat_sl/psp_test.h
@@ -1,27 +1,29 @@
 /*
- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded
+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded
  *
- * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license 
+ * The FreeRTOS+FAT SL license terms are different to the FreeRTOS license
  * terms.
- * 
+ *
  * FreeRTOS+FAT SL uses a dual license model that allows the software to be used
- * under a pure GPL open source license (as opposed to the modified GPL licence
- * under which FreeRTOS is distributed) or a commercial license.  Details of 
- * both license options follow:
- * 
+ * under a standard GPL open source license, or a commercial license.  The
+ * standard GPL license (unlike the modified GPL license under which FreeRTOS
+ * itself is distributed) requires that all software statically linked with
+ * FreeRTOS+FAT SL is also distributed under the same GPL V2 license terms.
+ * Details of both license options follow:
+ *
  * - Open source licensing -
  * FreeRTOS+FAT SL is a free download and may be used, modified, evaluated and
- * distributed without charge provided the user adheres to version two of the 
- * GNU General Public License (GPL) and does not remove the copyright notice or 
+ * distributed without charge provided the user adheres to version two of the
+ * GNU General Public License (GPL) and does not remove the copyright notice or
  * this text.  The GPL V2 text is available on the gnu.org web site, and on the
  * following URL: http://www.FreeRTOS.org/gpl-2.0.txt.
- * 
+ *
  * - Commercial licensing -
  * Businesses and individuals who for commercial or other reasons cannot comply
- * with the terms of the GPL V2 license must obtain a commercial license before 
- * incorporating FreeRTOS+FAT SL into proprietary software for distribution in 
- * any form.  Commercial licenses can be purchased from 
- * http://shop.freertos.org/fat_sl and do not require any source files to be 
+ * with the terms of the GPL V2 license must obtain a commercial license before
+ * incorporating FreeRTOS+FAT SL into proprietary software for distribution in
+ * any form.  Commercial licenses can be purchased from
+ * http://shop.freertos.org/fat_sl and do not require any source files to be
  * changed.
  *
  * FreeRTOS+FAT SL is distributed in the hope that it will be useful.  You
@@ -43,11 +45,11 @@
 #include "../../../psp/include/psp_string.h"
 
 #include "../../../version/ver_fat_sl.h"
-#if VER_FAT_SL_MAJOR != 3
+#if VER_FAT_SL_MAJOR != 5
  #error Incompatible FAT_SL version number!
 #endif
 #include "../../../version/ver_psp_fat_sl.h"
-#if VER_PSP_FAT_FAT_SL_MAJOR != 1 || VER_PSP_FAT_FAT_SL_MINOR != 1
+#if VER_PSP_FAT_FAT_SL_MAJOR != 1 || VER_PSP_FAT_FAT_SL_MINOR != 2
  #error Incompatible PSP_FAT_FAT_SL version number!
 #endif
 
@@ -55,13 +57,11 @@
 extern "C" {
 #endif
 
-extern uint8_t  all_tests_passed;
-
 /* Use to display text (printf). */
 void _f_dump ( char * s );
 
 /* Use to display test result (printf). */
-uint8_t _f_result ( uint8_t testnum, uint32_t result );
+uint8_t _f_result ( int linenum, uint32_t result );
 
 /* Use to build file system (mount). */
 uint8_t _f_poweron ( void );