cc65 2.13. features a default-per-target mouse driver so there's no need to deal with their names in Contiki anymore.

This commit is contained in:
oliverschmidt 2009-10-18 09:33:08 +00:00
parent 79d7c366a3
commit 31eb62821f
4 changed files with 6 additions and 9 deletions

View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $Id: ctk-mouse.c,v 1.2 2007/12/24 00:13:28 oliverschmidt Exp $ * $Id: ctk-mouse.c,v 1.3 2009/10/18 09:33:08 oliverschmidt Exp $
*/ */
#include <mouse.h> #include <mouse.h>
@ -52,7 +52,7 @@ ctk_mouse_init(void)
{ {
struct mod_ctrl module_control = {cfs_read}; struct mod_ctrl module_control = {cfs_read};
module_control.callerdata = cfs_open(MOUSE_CONF_DRIVER, CFS_READ); module_control.callerdata = cfs_open(mouse_stddrv, CFS_READ);
okay = module_control.callerdata >= 0; okay = module_control.callerdata >= 0;
if(okay) { if(okay) {
okay = mod_load(&module_control) == MLOAD_OK; okay = mod_load(&module_control) == MLOAD_OK;

View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $Id: contiki-conf.h,v 1.14 2008/05/23 23:13:41 oliverschmidt Exp $ * $Id: contiki-conf.h,v 1.15 2009/10/18 09:33:08 oliverschmidt Exp $
*/ */
#ifndef __CONTIKI_CONF_H__ #ifndef __CONTIKI_CONF_H__
@ -47,7 +47,6 @@
#define CTK_CONF_WIDGETUP_KEY 0x01 /* Ctrl-A */ #define CTK_CONF_WIDGETUP_KEY 0x01 /* Ctrl-A */
#define CTK_CONF_WIDGETDOWN_KEY '\t' /* Tab or Ctrl-I */ #define CTK_CONF_WIDGETDOWN_KEY '\t' /* Tab or Ctrl-I */
#define MOUSE_CONF_DRIVER "a2e.stdmou.mou"
#define MOUSE_CONF_XTOC(x) ((x) * 2 / 7) #define MOUSE_CONF_XTOC(x) ((x) * 2 / 7)
#define MOUSE_CONF_YTOC(y) ((y) / 8) #define MOUSE_CONF_YTOC(y) ((y) / 8)

View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $Id: contiki-conf.h,v 1.1 2008/01/05 22:30:23 oliverschmidt Exp $ * $Id: contiki-conf.h,v 1.2 2009/10/18 09:33:08 oliverschmidt Exp $
*/ */
#ifndef __CONTIKI_CONF_H__ #ifndef __CONTIKI_CONF_H__
@ -45,8 +45,7 @@
#define CTK_CONF_WIDGETUP_KEY CH_F5 #define CTK_CONF_WIDGETUP_KEY CH_F5
#define CTK_CONF_WIDGETDOWN_KEY CH_F7 #define CTK_CONF_WIDGETDOWN_KEY CH_F7
#define MOUSE_CONF_DRIVER "c128-1351.mou" #define MOUSE_CONF_XTOC(x) ((x) / 4)
#define MOUSE_CONF_XTOC(x) ((x) / 8)
#define MOUSE_CONF_YTOC(y) ((y) / 8) #define MOUSE_CONF_YTOC(y) ((y) / 8)
#define BORDERCOLOR COLOR_LIGHTBLUE #define BORDERCOLOR COLOR_LIGHTBLUE

View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $Id: contiki-conf.h,v 1.15 2008/01/01 19:48:46 oliverschmidt Exp $ * $Id: contiki-conf.h,v 1.16 2009/10/18 09:33:08 oliverschmidt Exp $
*/ */
#ifndef __CONTIKI_CONF_H__ #ifndef __CONTIKI_CONF_H__
@ -45,7 +45,6 @@
#define CTK_CONF_WIDGETUP_KEY CH_F5 #define CTK_CONF_WIDGETUP_KEY CH_F5
#define CTK_CONF_WIDGETDOWN_KEY CH_F7 #define CTK_CONF_WIDGETDOWN_KEY CH_F7
#define MOUSE_CONF_DRIVER "c64-1351.mou"
#define MOUSE_CONF_XTOC(x) ((x) / 8) #define MOUSE_CONF_XTOC(x) ((x) / 8)
#define MOUSE_CONF_YTOC(y) ((y) / 8) #define MOUSE_CONF_YTOC(y) ((y) / 8)