diff --git a/platform/win32/Makefile.win32 b/platform/win32/Makefile.win32
index c0c80e931..0f64be04a 100644
--- a/platform/win32/Makefile.win32
+++ b/platform/win32/Makefile.win32
@@ -29,7 +29,7 @@
#
# Author: Oliver Schmidt
#
-# $Id: Makefile.win32,v 1.4 2007/04/14 23:23:15 oliverschmidt Exp $
+# $Id: Makefile.win32,v 1.5 2007/04/15 13:30:16 oliverschmidt Exp $
#
ifndef CONTIKI
@@ -41,10 +41,10 @@ TARGET_LIBFILES = /lib/w32api/libws2_32.a /lib/w32api/libiphlpapi.a
CONTIKI_TARGET_DIRS = . cfs ctk loader
CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o}
-CONTIKI_TARGET_SOURCEFILES = contiki-main.c clock.c cfs-win32.c ctk-console.c \
- dll-loader.c
+CONTIKI_TARGET_SOURCEFILES = contiki-main.c clock.c cfs-win32.c \
+ ctk-console.c dll-loader.c
-CONTIKI_SOURCEFILES += $(CTK) ctk-conio-service.c ctk-draw.c wpcap.c wpcap-service.c \
+CONTIKI_SOURCEFILES += $(CTK) ctk-conio.c wpcap.c wpcap-service.c \
$(CONTIKI_TARGET_SOURCEFILES)
.SUFFIXES:
diff --git a/platform/win32/conio.h b/platform/win32/conio.h
index 88479cdc7..e69de29bb 100644
--- a/platform/win32/conio.h
+++ b/platform/win32/conio.h
@@ -1,2 +0,0 @@
-#include "ctk/ctk.h"
-#include "ctk/ctk-console.h"
diff --git a/platform/win32/contiki-conf.h b/platform/win32/contiki-conf.h
index d7dd3a3b4..2450c7fb0 100644
--- a/platform/win32/contiki-conf.h
+++ b/platform/win32/contiki-conf.h
@@ -35,6 +35,8 @@ typedef unsigned long clock_time_t;
#include
#define ctk_arch_isprint isprint
+#include "ctk/ctk-console.h"
+
#define CH_ULCORNER 0xDA
#define CH_URCORNER 0xBF
#define CH_LLCORNER 0xC0
diff --git a/platform/win32/contiki-main.c b/platform/win32/contiki-main.c
index 78fe2f2d3..53e3763af 100644
--- a/platform/win32/contiki-main.c
+++ b/platform/win32/contiki-main.c
@@ -30,7 +30,7 @@
*
* Author: Oliver Schmidt
*
- * $Id: contiki-main.c,v 1.8 2007/04/14 23:23:15 oliverschmidt Exp $
+ * $Id: contiki-main.c,v 1.9 2007/04/15 13:30:16 oliverschmidt Exp $
*/
#define WIN32_LEAN_AND_MEAN
@@ -50,14 +50,12 @@
#include "sys/etimer.h"
#include "cfs/cfs-win32.h"
-#include "ctk/ctk-conio-service.h"
#include "net/wpcap-service.h"
#include "program-handler.h"
PROCINIT(&etimer_process,
&wpcap_process,
&cfs_win32_process,
- &ctk_conio_service_process,
&ctk_process,
&tcpip_process,
&resolv_process,
diff --git a/platform/win32/ctk/ctk-console.c b/platform/win32/ctk/ctk-console.c
index 8b5df5110..bef9100ac 100644
--- a/platform/win32/ctk/ctk-console.c
+++ b/platform/win32/ctk/ctk-console.c
@@ -30,7 +30,7 @@
*
* Author: Oliver Schmidt
*
- * $Id: ctk-console.c,v 1.8 2007/04/14 14:57:53 oliverschmidt Exp $
+ * $Id: ctk-console.c,v 1.9 2007/04/15 13:30:16 oliverschmidt Exp $
*/
#define WIN32_LEAN_AND_MEAN
@@ -401,7 +401,7 @@ console_read(void)
}
}
/*-----------------------------------------------------------------------------------*/
-ctk_arch_key_t
+char
ctk_arch_getkey(void)
{
console_read();
@@ -424,14 +424,26 @@ unsigned short
ctk_mouse_x(void)
{
console_read();
- return xpos * 8;
+ return xpos;
}
/*-----------------------------------------------------------------------------------*/
unsigned short
ctk_mouse_y(void)
{
console_read();
- return ypos * 8;
+ return ypos;
+}
+/*-----------------------------------------------------------------------------------*/
+unsigned short
+ctk_mouse_xtoc(unsigned short x)
+{
+ return x;
+}
+/*-----------------------------------------------------------------------------------*/
+unsigned short
+ctk_mouse_ytoc(unsigned short y)
+{
+ return y;
}
/*-----------------------------------------------------------------------------------*/
unsigned char
diff --git a/platform/win32/ctk/ctk-console.h b/platform/win32/ctk/ctk-console.h
index 15c9fcd64..74a58ab39 100644
--- a/platform/win32/ctk/ctk-console.h
+++ b/platform/win32/ctk/ctk-console.h
@@ -30,7 +30,7 @@
*
* Author: Oliver Schmidt
*
- * $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__ */
diff --git a/platform/win32/vcproj/contiki.exe.vcproj b/platform/win32/vcproj/contiki.exe.vcproj
index 70219a8a3..3559a1f26 100644
--- a/platform/win32/vcproj/contiki.exe.vcproj
+++ b/platform/win32/vcproj/contiki.exe.vcproj
@@ -249,19 +249,7 @@
Name="ctk"
>
-
-
-
-
-
-