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

Some changes have been applied to support various CTK configurations.

Browse source
This commit is contained in:
matsutsuka 2007-11-28 09:38:21 +00:00
parent 5d1aaa4fe8
commit e1456c5522
4 changed files with 48 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
platform/pc-6001/ctk/ctk_arch-def.h
View file

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: ctk_arch-def.h,v 1.3 2007/09/29 04:10:00 matsutsuka Exp $ * $Id: ctk_arch-def.h,v 1.4 2007/11/28 09:38:21 matsutsuka Exp $
* *
*/ */
@ -111,31 +111,48 @@
/* Contiki toolkit options */ /* Contiki toolkit options */
#if defined(CTK_CLIENT) || defined(CTK_SERVER)
/* If network is available, turn all options off by the memory reason */
#define CTK_CONF_ICONS 0
#define CTK_CONF_ICON_TEXTMAPS 0
#define CTK_CONF_WINDOWCLOSE 0
#define CTK_CONF_WINDOWMOVE 0
#define CTK_CONF_MENUS 0
#define CTK_CONF_HYPERLINK 0
#elif defined(CTK_NOICON)
/* In the case of loader arch, we omit the icons by the memory reason */
#define CTK_CONF_ICONS 0
#define CTK_CONF_ICON_TEXTMAPS 0
#define CTK_CONF_WINDOWCLOSE 1
#define CTK_CONF_WINDOWMOVE 1
#define CTK_CONF_MENUS 1
#define CTK_CONF_HYPERLINK 1
#else /* CTK_MINIMUM */
/* Toggles support for desktop icons. */ /* Toggles support for desktop icons. */
#define CTK_CONF_ICONS 1 #define CTK_CONF_ICONS 1
/* Define if text icon is used. */ /* Define if text icon is used. */
#define CTK_CONF_ICON_TEXTMAPS 1 #define CTK_CONF_ICON_TEXTMAPS 1
/* Define if bitmap icon is used. */
#define CTK_CONF_ICON_BITMAPS 0
/* Toggles support for closable windows. */ /* Toggles support for closable windows. */
#define CTK_CONF_WINDOWCLOSE 1 #define CTK_CONF_WINDOWCLOSE 1
/* Toggles support for movable windows. */ /* Toggles support for movable windows. */
#define CTK_CONF_WINDOWMOVE 1 #define CTK_CONF_WINDOWMOVE 1
/* Toggles support for menus. */ /* Toggles support for menus. */
#define CTK_CONF_MENUS 1 #define CTK_CONF_MENUS 1
/* Defines if hyperlink is supported. */
#define CTK_CONF_HYPERLINK 1
#endif /* CTK_MINIMUM */
/* Define if bitmap icon is used. */
#define CTK_CONF_ICON_BITMAPS 0
/* Defines the default width of a menu. */ /* Defines the default width of a menu. */
#define CTK_CONF_MENUWIDTH 16 #define CTK_CONF_MENUWIDTH 16
/* Defines if screen saver is supported. */ /* Defines if screen saver is supported. */
#define CTK_CONF_SCREENSAVER 0 #define CTK_CONF_SCREENSAVER 0
/* Defines if mouse is supported. */ /* Defines if mouse is supported. */
#define CTK_CONF_MOUSE_SUPPORT 0 #define CTK_CONF_MOUSE_SUPPORT 0
/* Defines if hyperlink is supported. */
#define CTK_CONF_HYPERLINK 1
/* The maximum number of menu items in each menu. */ /* The maximum number of menu items in each menu. */
#define CTK_CONF_MAXMENUITEMS 4 #define CTK_CONF_MAXMENUITEMS 4
//#define CTK_CONF_MAX_REDRAWWIDGETS 2
//#define CTK_CONF_MAX_REDRAWWINDOWS 2
/* Key used to switch the frontmost window. */ /* Key used to switch the frontmost window. */
#define CTK_CONF_WINDOWSWITCH_KEY CH_F3 #define CTK_CONF_WINDOWSWITCH_KEY CH_F3

15
platform/pc-6001/ctk/libconio_arch-small.cS
View file

@ -7,7 +7,7 @@
;;; ;;;
;;; @author Takahide Matsutsuka <markn@markn.org> ;;; @author Takahide Matsutsuka <markn@markn.org>
;;; ;;;
;;; $Id: libconio_arch-small.cS,v 1.1 2007/09/30 12:46:34 matsutsuka Exp $ ;;; $Id: libconio_arch-small.cS,v 1.2 2007/11/28 09:38:21 matsutsuka Exp $
;;; ;;;
;; uses preprocessor to enable definitions ;; uses preprocessor to enable definitions
@ -16,6 +16,7 @@
;; export symbols ;; export symbols
.globl _clrscr_arch .globl _clrscr_arch
.globl _libputc_arch .globl _libputc_arch
.globl _libputs_arch
.area _DATA .area _DATA
_screen_offset:: _screen_offset::
@ -99,4 +100,16 @@ _libputc_arch_scroll_loop:
pop de pop de
jr _libputc_arch_putc jr _libputc_arch_putc
_libputs_arch:
ld hl, #2
add hl, sp
ld e, (hl)
inc hl
ld d, (hl)
_libputs_arch_loop:
ld a, (hl)
or a
ret z
call _libputc_asm
jr _libputs_arch_loop
_libconio_arch_small_end:: _libconio_arch_small_end::

8
platform/pc-6001/ctk/libconio_arch-small.h
View file

@ -2,7 +2,13 @@
#define __LIBCONIO_ARCH_MSLL_H__ #define __LIBCONIO_ARCH_MSLL_H__
#include "contiki.h" #include "contiki.h"
void clrscr_arch(); void clrscr_arch(void);
void libputc_arch(unsigned char ch); void libputc_arch(unsigned char ch);
void libputs_arch(char* str);
unsigned char wherex(void);
unsigned char wherey(void);
void gotoxy(unsigned char x, unsigned char y);
#endif /* __LIBCONIO_ARCH_MSLL_H__ */ #endif /* __LIBCONIO_ARCH_MSLL_H__ */

4
platform/pc-6001/ctk/libconio_arch.h
View file

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: libconio_arch.h,v 1.2 2007/09/29 04:10:00 matsutsuka Exp $ * $Id: libconio_arch.h,v 1.3 2007/11/28 09:38:21 matsutsuka Exp $
* *
*/ */
@ -51,9 +51,9 @@ void cvline_arch(unsigned char length);
void clip_arch(unsigned char clip1, unsigned char clip2); void clip_arch(unsigned char clip1, unsigned char clip2);
void clearto_arch(unsigned char to); void clearto_arch(unsigned char to);
void revers_arch(unsigned char reversed); void revers_arch(unsigned char reversed);
void gotoxy_arch(unsigned char x, unsigned char y);
#endif /* LIBCONIO_CONF_EXPORT */ #endif /* LIBCONIO_CONF_EXPORT */
unsigned char wherex_arch(); unsigned char wherex_arch();
unsigned char wherey_arch(); unsigned char wherey_arch();
void gotoxy_arch(unsigned char x, unsigned char y);
#endif /* __LIBCONIO_ARCH_H__ */ #endif /* __LIBCONIO_ARCH_H__ */