some pgmspace types are deprecated

[aversive.git] / modules / ihm / parse / parse_string.h

diff --git a/modules/ihm/parse/parse_string.h b/modules/ihm/parse/parse_string.h
index 0d09892..41ba3c7 100644 (file)
--- a/modules/ihm/parse/parse_string.h
+++ b/modules/ihm/parse/parse_string.h
@@ -9,7 +9,7 @@
 typedef char fixed_string_t[STR_TOKEN_SIZE];
 
 struct token_string_data {
-       const prog_char * str;
+       PGM_P str;
 };
 
 struct token_string {
@@ -17,19 +17,14 @@ struct token_string {
        struct token_string_data string_data;
 };
 typedef struct token_string parse_token_string_t;
-struct token_string_pgm {
-       struct token_hdr hdr;
-       struct token_string_data string_data;
-} PROGMEM;
-typedef struct token_string_pgm parse_pgm_token_string_t;
 
 extern struct token_ops token_string_ops;
 
-int8_t parse_string(parse_pgm_token_hdr_t * tk, const char * srcbuf, void * res);
-int8_t complete_get_nb_string(parse_pgm_token_hdr_t * tk);
-int8_t complete_get_elt_string(parse_pgm_token_hdr_t * tk, int8_t idx, 
+int8_t parse_string(PGM_P tk, const char * srcbuf, void * res);
+int8_t complete_get_nb_string(PGM_P tk);
+int8_t complete_get_elt_string(PGM_P tk, int8_t idx, 
                               char * dstbuf, uint8_t size);
-int8_t get_help_string(parse_pgm_token_hdr_t * tk, char * dstbuf, uint8_t size);
+int8_t get_help_string(PGM_P tk, char * dstbuf, uint8_t size);
 
 #define TOKEN_STRING_INITIALIZER(structure, field, string)  \
 {                                                          \