deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Converted u8_t to uint8_t and u16_t to uint16_t in the platforms directory.

Browse source 
Added "These names are deprecated, use C99 names" warnings the contiki-conf.h files that were missing it.
This commit is contained in:
Nicholas J Humfrey 2012-02-20 19:32:05 +00:00 • committed by Mariano Alvira
parent a561d20828
commit 680225e99d
57 changed files with 274 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.c
View file

@ -165,7 +165,7 @@ generate_file_stats(void *arg)
static const char httpd_cgi_filestat3[] HTTPD_STRING_ATTR = "%5u";
char tmp[20];
struct httpd_fsdata_file_noconst *f,fram;
u16_t i;
uint16_t i;
unsigned short numprinted;
/* Transfer arg from whichever flash that contains the html file to RAM */

14
platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.c
View file

@ -40,7 +40,7 @@
#include "httpd-fsdata.c"
#if HTTPD_FS_STATISTICS==2
u16_t httpd_filecount[HTTPD_FS_NUMFILES];
uint16_t httpd_filecount[HTTPD_FS_NUMFILES];
#endif /* HTTPD_FS_STATISTICS */
/*-----------------------------------------------------------------------------------*/
@ -50,18 +50,18 @@ httpd_fs_get_root()
return (void *)HTTPD_FS_ROOT;
}
/*-----------------------------------------------------------------------------------*/
u16_t
uint16_t
httpd_fs_get_size()
{
return HTTPD_FS_SIZE;
}
/*-----------------------------------------------------------------------------------*/
u16_t
uint16_t
httpd_fs_open(const char *name, struct httpd_fs_file *file)
{
#if HTTPD_FS_STATISTICS
u16_t i = 0;
uint16_t i = 0;
#endif /* HTTPD_FS_STATISTICS */
struct httpd_fsdata_file_noconst *f,fram;
@ -103,7 +103,7 @@ void
httpd_fs_init(void)
{
#if HTTPD_FS_STATISTICS && 0 //count will already be zero at boot
u16_t i;
uint16_t i;
for(i = 0; i < HTTPD_FS_NUMFILES; i++) {
count[i] = 0;
}
@ -111,11 +111,11 @@ httpd_fs_init(void)
}
/*-----------------------------------------------------------------------------------*/
#if HTTPD_FS_STATISTICS && 0 //Not needed, httpd_fs_open returns count
u16_t
uint16_t
httpd_fs_count(char *name)
{
struct httpd_fsdata_file_noconst *f,fram;
u16_t i;
uint16_t i;
i = 0;
for(f = (struct httpd_fsdata_file_noconst *)HTTPD_FS_ROOT;

6
platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs.h
View file

@ -41,7 +41,7 @@
#define HTTPD_FS_STATISTICS 2 //Puts count in RAM array
#if HTTPD_FS_STATISTICS==2
extern u16_t httpd_filecount[];
extern uint16_t httpd_filecount[];
#endif /* HTTPD_FS_STATISTICS */
#include <avr/pgmspace.h>
@ -59,12 +59,12 @@ void httpd_fs_init(void);
/* Returns root of http files in program flash */
void* httpd_fs_get_root();
/* Returns size of http files in any flash */
u16_t httpd_fs_get_size();
uint16_t httpd_fs_get_size();
/* Open a file in any flash and return statistics if enabled.
If file is allocated by caller it will be filled in.
If NULL, just file stats are returned.
*/
u16_t httpd_fs_open(const char *name, struct httpd_fs_file *file);
uint16_t httpd_fs_open(const char *name, struct httpd_fs_file *file);
#if COFFEE_FILES
/* Coffee file system can be static or dynamic. If static, new files

2
platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.c
View file

@ -625,7 +625,7 @@ struct httpd_fsdata_file {
const char *data; //offset to coffee file data
const int len; //length of file data
#if HTTPD_FS_STATISTICS == 1 //not enabled since list is in PROGMEM
u16_t count; //storage for file statistics
uint16_t count; //storage for file statistics
#endif
}
*/

4
platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.h
View file

@ -43,7 +43,7 @@ struct httpd_fsdata_file {
const char *data;
const int len;
#if HTTPD_FS_STATISTICS == 1
u16_t count;
uint16_t count;
#endif /* HTTPD_FS_STATISTICS */
};
@ -53,7 +53,7 @@ struct httpd_fsdata_file_noconst {
char *data;
int len;
#if HTTPD_FS_STATISTICS == 1
u16_t count;
uint16_t count;
#endif /* HTTPD_FS_STATISTICS */
};