X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=modules%2Fihm%2Fparse%2Fparse_string.c;h=8449ac3da254b4dfdaa5f102894d310f0f3a1ce9;hp=abfe8bb9c8b558efbf874d129e552317b53729a1;hb=e2732473f4de080bc937fbe9f1ee6a175bfbafb3;hpb=dca9a3df0b345216fb2ebe900ff3a3d46e9a1cf0

diff --git a/modules/ihm/parse/parse_string.c b/modules/ihm/parse/parse_string.c
index abfe8bb..8449ac3 100644
--- a/modules/ihm/parse/parse_string.c
+++ b/modules/ihm/parse/parse_string.c
@@ -18,9 +18,9 @@ struct token_ops token_string_ops = {
 #define FIXEDSTRING_HELP PSTR("Fixed STRING")
 
 static uint8_t
-get_token_len(const prog_char * s)
+get_token_len(const char * s)
 {
-        prog_char c;
+        char c;
 	uint8_t i=0;
 
 	c = pgm_read_byte(s+i);
@@ -31,8 +31,8 @@ get_token_len(const prog_char * s)
         return i;
 }
 
-static const prog_char *
-get_next_token(const prog_char * s)
+static const char *
+get_next_token(PGM_P s)
 {
 	uint8_t i;
 	i = get_token_len(s);
@@ -42,11 +42,11 @@ get_next_token(const prog_char * s)
 }
 
 int8_t 
-parse_string(parse_pgm_token_hdr_t * tk, const char * buf, void * res)
+parse_string(PGM_P tk, const char * buf, void * res)
 {
 	struct token_string_data sd;
 	uint8_t token_len;
-	const prog_char * str;
+	PGM_P str;
 
 	if (! *buf)
 		return -1;
@@ -100,7 +100,7 @@ parse_string(parse_pgm_token_hdr_t * tk, const char * buf, void * res)
         return token_len;
 }
 
-int8_t complete_get_nb_string(parse_pgm_token_hdr_t * tk)
+int8_t complete_get_nb_string(PGM_P tk)
 {
 	struct token_string_data sd;
 	int8_t ret=1;
@@ -116,11 +116,11 @@ int8_t complete_get_nb_string(parse_pgm_token_hdr_t * tk)
 	return ret;
 }
 
-int8_t complete_get_elt_string(parse_pgm_token_hdr_t * tk, int8_t idx, 
+int8_t complete_get_elt_string(PGM_P tk, int8_t idx, 
 			      char * dstbuf, uint8_t size)
 {
 	struct token_string_data sd;
-	const prog_char * s;
+	PGM_P s;
 	uint8_t len;
 
 	memcpy_P(&sd, &((struct token_string *)tk)->string_data, sizeof(sd));
@@ -143,10 +143,10 @@ int8_t complete_get_elt_string(parse_pgm_token_hdr_t * tk, int8_t idx,
 }
 
 
-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)
 {
 	struct token_string_data sd;
-	const prog_char * s;
+	PGM_P s;
 	
 	memcpy_P(&sd, &((struct token_string *)tk)->string_data, sizeof(sd));
 	s = sd.str;