Changeset 822 for soft/giet_vm/applications/rosenfeld/nrc2/include/nrio0.h

Timestamp:

Jun 1, 2016, 10:25:43 AM (8 years ago)

Author:

meunier

Message:

In rosenfeld:

• Updated nrio0, nrio1, nrio2, nrio1f, nrio2f, nrio1x, nrbool1, nrbool2 and nralloc1 in the nrc2 lib in order to use macro-typed functions
• Updated the simulation script to include performance evaluation with random images, and a script to generate graphs
• Updated the clock.h to use 64-bit integers, which potentially breaks the printing on the giet

File:

• soft/giet_vm/applications/rosenfeld/nrc2/include/nrio0.h (modified) (1 diff)

soft/giet_vm/applications/rosenfeld/nrc2/include/nrio0.h

@@ -11 +11 @@
 #define _NR_IO0_H_
 
-#ifdef __cplusplus
-#pragma message ("C++")
-extern "C" {
-#endif
-    
-#ifdef VERBOSE_PRAGMA
-//#pragma message ("- *** include nrio0.h ***")
-#endif
+void generate_filename_k_ndigit          (char * filename, int k, int ndigit,                   char * complete_filename, int maxlen);
+void generate_filename_k_ndigit_extension(char * filename, int k, int ndigit, char * extension, char * complete_filename, int maxlen);
 
-IMAGE_EXPORT(void) generate_filename_k_ndigit          (char *filename, int k, int ndigit,                  char *complete_filename, int maxlen);
-IMAGE_EXPORT(void) generate_filename_k_ndigit_extension(char *filename, int k, int ndigit, char *extension, char *complete_filename, int maxlen);
+void generate_path_filename                     (char * path, char * filename,                                             char * complete_filename, int maxlen);
+void generate_path_filename_extension           (char * path, char * filename,                           char * extension, char * complete_filename, int maxlen);
+void generate_path_filename_suffix_extension    (char * path, char * filename, char * suffix,            char * extension, char * complete_filename, int maxlen);
+void generate_path_filename_k_ndigit_extension  (char * path, char * filename, int k, int ndigit,        char * extension, char * complete_filename, int maxlen);
+void generate_path_filename_k_ndigit_l_extension(char * path, char * filename, int k, int ndigit, int l, char * extension, char * complete_filename, int maxlen);
 
-IMAGE_EXPORT(void) generate_path_filename                     (char *path, char *filename,                                            char *complete_filename, int maxlen);
-IMAGE_EXPORT(void) generate_path_filename_extension           (char *path, char *filename,                           char *extension, char *complete_filename, int maxlen);
-IMAGE_EXPORT(void) generate_path_filename_suffix_extension    (char *path, char *filename, char *suffix,             char *extension, char *complete_filename, int maxlen);
-IMAGE_EXPORT(void) generate_path_filename_k_ndigit_extension  (char *path, char *filename, int k, int ndigit,        char *extension, char *complete_filename, int maxlen);
-IMAGE_EXPORT(void) generate_path_filename_k_ndigit_l_extension(char *path, char *filename, int k, int ndigit, int l, char *extension, char *complete_filename, int maxlen);
+void select_display_positive_parameters(int iformat, char ** format, char ** str);
 
-void select_display_positive_parameters(int iformat, char **format, char **str);
-
-#ifdef __cplusplus
-}
-#endif
 
 #endif // _NR_IO0_H_