From 9f74843ab27734603c43e9228cd7f939353061b4 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 18 Sep 2008 17:38:26 +0000 Subject: 2008-09-18 Joel Sherrill * console/console.c, include/bsp.h: Remove unnecessary boilerplate comments. Eliminate use of EXTERN and move unnneccessarily global variables to console.c. --- c/src/lib/libbsp/m68k/mvme136/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/mvme136/console/console.c | 7 +++++-- c/src/lib/libbsp/m68k/mvme136/include/bsp.h | 27 ------------------------- 3 files changed, 11 insertions(+), 29 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index cff0687c54..2020ec6d8f 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog @@ -1,3 +1,9 @@ +2008-09-18 Joel Sherrill + + * console/console.c, include/bsp.h: Remove unnecessary boilerplate + comments. Eliminate use of EXTERN and move unnneccessarily global + variables to console.c. + 2008-09-16 Joel Sherrill * Makefile.am, startup/linkcmds: Use top level shared diff --git a/c/src/lib/libbsp/m68k/mvme136/console/console.c b/c/src/lib/libbsp/m68k/mvme136/console/console.c index 40886f5d26..3e5027cef1 100644 --- a/c/src/lib/libbsp/m68k/mvme136/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme136/console/console.c @@ -11,11 +11,14 @@ * $Id$ */ -#define M136_INIT - #include #include +volatile struct r_m681_info *_Read_m681; /* M68681 read registers */ +volatile struct w_m681_info *_Write_m681; /* M68681 write registers */ + + + /* console_initialize * * This routine initializes the console IO driver. diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index fcf8a3b7b7..4bfb3b60b3 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -80,35 +80,8 @@ struct w_m681_info { char ivr; /* interrupt vector register */ }; -#ifdef M136_INIT -#undef EXTERN -#define EXTERN -#else -#undef EXTERN -#define EXTERN extern -#endif - -/* miscellaneous stuff assumed to exist */ - -/* M68681 DUART chip register variables */ - -EXTERN volatile struct r_m681_info *_Read_m681; /* M68681 read registers */ -EXTERN volatile struct w_m681_info *_Write_m681; /* M68681 write registers */ - extern m68k_isr_entry M68Kvec[]; /* vector table address */ -/* - * Device Driver Table Entries - */ - -/* - * NOTE: Use the standard Console driver entry - */ - -/* - * NOTE: Use the standard Clock driver entry - */ - /* functions */ m68k_isr_entry set_vector( -- cgit v1.2.3