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

- Switched from from a CTK draw service to a statically linked CTK draw implementation.

Browse source 
- Workarounded the following CTK glitch:

ctk.c calls ctk_arch_keyavail() and ctk_arch_getkey() and needs therefore appropriate declarations (or macros) but it doesn't include a ctk_arch.h or alike to bring those in. So it's necessary to bring those declarations in via contiki-conf.h.

But ctk_arch_getkey() is supposed to return a ctk_arch_key_t - and this typedef'ed in ctk.h which means that ctk.h would need to be included in contiki-conf.h before declaring ctk_arch_getkey().

This IS rather undesirable so the current workaround is to declare ctk_arch_getkey() as returning a char - this is btw done similiar in platform/gtk as well. See ctk/ctk-gtksim.h:

guint ctk_arch_getkey(void);
This commit is contained in:
oliverschmidt 2007-04-15 13:30:16 +00:00
parent 13cdcbe393
commit 33eeb8ccbb
7 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platform/win32/ctk/ctk-console.h
View file

@ -30,7 +30,7 @@
*
* Author: Oliver Schmidt <ol.sc@web.de>
*
* $Id: ctk-console.h,v 1.4 2006/10/03 11:27:51 oliverschmidt Exp $
* $Id: ctk-console.h,v 1.5 2007/04/15 13:30:17 oliverschmidt Exp $
*/
#ifndef __CTK_CONSOLE_H__
#define __CTK_CONSOLE_H__
@ -62,7 +62,7 @@ void cputsxy(unsigned char x, unsigned char y, char *str);
void cputcxy(unsigned char x, unsigned char y, char c);
void textcolor(unsigned char c);
ctk_arch_key_t ctk_arch_getkey(void);
char ctk_arch_getkey(void);
unsigned char ctk_arch_keyavail(void);
#endif /* __CTK_CONSOLE_H__ */