diff --git a/cpu/6502/Makefile.6502 b/cpu/6502/Makefile.6502 index f84934b40..ce60b3f9b 100644 --- a/cpu/6502/Makefile.6502 +++ b/cpu/6502/Makefile.6502 @@ -30,7 +30,7 @@ # # Author: Oliver Schmidt # -# $Id: Makefile.6502,v 1.18 2007/11/30 12:34:08 oliverschmidt Exp $ +# $Id: Makefile.6502,v 1.19 2007/12/08 22:18:46 oliverschmidt Exp $ # ifndef CONTIKI @@ -51,7 +51,7 @@ endif all: cs8900a.eth lan91c96.eth -CONTIKI_TARGET_DIRS = . +CONTIKI_TARGET_DIRS = . lib CONTIKI_CPU_DIRS = . lib net sys CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o} diff --git a/cpu/6502/lib/error.c b/platform/apple2enh/lib/error.c similarity index 95% rename from cpu/6502/lib/error.c rename to platform/apple2enh/lib/error.c index 24baa514b..23483218e 100644 --- a/cpu/6502/lib/error.c +++ b/platform/apple2enh/lib/error.c @@ -30,9 +30,10 @@ * * Author: Oliver Schmidt * - * $Id: error.c,v 1.1 2007/11/27 18:17:47 oliverschmidt Exp $ + * $Id: error.c,v 1.1 2007/12/08 22:16:57 oliverschmidt Exp $ */ +#include #include #include @@ -43,7 +44,7 @@ void error_exit(void) { fprintf(stderr, "Press any key to continue ...\n"); - getchar(); + cgetc(); exit(EXIT_FAILURE); } /*-----------------------------------------------------------------------------------*/ diff --git a/platform/c64/lib/error.c b/platform/c64/lib/error.c new file mode 100644 index 000000000..6380342f2 --- /dev/null +++ b/platform/c64/lib/error.c @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2007, Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of the Contiki operating system. + * + * Author: Oliver Schmidt + * + * $Id: error.c,v 1.1 2007/12/08 22:17:14 oliverschmidt Exp $ + */ + +#include + +#include "lib/error.h" + +/*-----------------------------------------------------------------------------------*/ +void +error_exit(void) +{ + exit(EXIT_FAILURE); +} +/*-----------------------------------------------------------------------------------*/