From: Alan Cox Date: Sat, 9 May 2015 17:12:37 +0000 (+0100) Subject: dragon: Switch COCO_KBD to CONFIG_COCO_KBD X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=803ed7861d2076bfcbfeb2284c4a09f847d969c3;p=FUZIX.git dragon: Switch COCO_KBD to CONFIG_COCO_KBD One day we'll get a nice configuration system so keep real platform type config items with CONFIG_ naming. --- diff --git a/Kernel/platform-dragon-nx32/config.h b/Kernel/platform-dragon-nx32/config.h index ed783454..9baef76c 100644 --- a/Kernel/platform-dragon-nx32/config.h +++ b/Kernel/platform-dragon-nx32/config.h @@ -37,7 +37,7 @@ extern unsigned char vt_mangle_6847(unsigned char c); #define VT_MAP_CHAR(x) vt_mangle_6847(x) /* RS/Tandy Color Computer keyboard */ -#undef COCO_KBD +#undef CONFIG_COCO_KBD #define TICKSPERSEC 50 /* Ticks per second */ /* FIXME: This will move once we put the display in the kernel bank and diff --git a/Kernel/platform-dragon-nx32/devtty.c b/Kernel/platform-dragon-nx32/devtty.c index a1e421cd..35502e29 100644 --- a/Kernel/platform-dragon-nx32/devtty.c +++ b/Kernel/platform-dragon-nx32/devtty.c @@ -141,7 +141,7 @@ static void keyproc(void) } } -#ifdef COCO_KBD +#ifdef CONFIG_COCO_KBD uint8_t keyboard[8][7] = { { '@', 'h', 'p', 'x', '0', '8', KEY_ENTER }, { 'a', 'i', 'q', 'y', '1', '9', 0 /* clear - used as ctrl*/ }, diff --git a/Kernel/platform-dragon/config.h b/Kernel/platform-dragon/config.h index ad81e32a..ba5a0c65 100644 --- a/Kernel/platform-dragon/config.h +++ b/Kernel/platform-dragon/config.h @@ -37,7 +37,7 @@ extern unsigned char vt_mangle_6847(unsigned char c); #define VT_MAP_CHAR(x) vt_mangle_6847(x) /* RS/Tandy Color Computer keyboard */ -#undef COCO_KBD +#undef CONFIG_COCO_KBD #define TICKSPERSEC 50 /* Ticks per second */ /* FIXME: This will move once we put the display in the kernel bank and diff --git a/Kernel/platform-dragon/devtty.c b/Kernel/platform-dragon/devtty.c index a1e421cd..35502e29 100644 --- a/Kernel/platform-dragon/devtty.c +++ b/Kernel/platform-dragon/devtty.c @@ -141,7 +141,7 @@ static void keyproc(void) } } -#ifdef COCO_KBD +#ifdef CONFIG_COCO_KBD uint8_t keyboard[8][7] = { { '@', 'h', 'p', 'x', '0', '8', KEY_ENTER }, { 'a', 'i', 'q', 'y', '1', '9', 0 /* clear - used as ctrl*/ },