From 5d0cc4c831b91714d7e2ed8cda4185c129c4c49f Mon Sep 17 00:00:00 2001 From: Neal Andrew Crook Date: Thu, 19 May 2016 19:51:55 +0100 Subject: [PATCH] prune away a bit more dead code. --- Kernel/platform-multicomp09/devices.c | 4 +++- Kernel/platform-multicomp09/devtty.h | 21 --------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/Kernel/platform-multicomp09/devices.c b/Kernel/platform-multicomp09/devices.c index 1fb191dd..3c92d385 100644 --- a/Kernel/platform-multicomp09/devices.c +++ b/Kernel/platform-multicomp09/devices.c @@ -9,7 +9,9 @@ #ifdef CONFIG_IDE #include #endif +#ifdef CONFIG_SD #include +#endif #include /* [NAC HACK 2016Apr24] add ds1302 */ @@ -49,7 +51,7 @@ void device_init(void) #ifdef CONFIG_IDE devide_init( ); #endif - /*#ifdef CONFIG_SDC [NAC HACK 2016Apr24] */ + #ifdef CONFIG_SD devsd_init( ); #endif diff --git a/Kernel/platform-multicomp09/devtty.h b/Kernel/platform-multicomp09/devtty.h index ed247618..accb9d4c 100644 --- a/Kernel/platform-multicomp09/devtty.h +++ b/Kernel/platform-multicomp09/devtty.h @@ -1,27 +1,6 @@ #ifndef __DEVTTY_DOT_H__ #define __DEVTTY_DOT_H__ -#include <../include/vt.h> -#include <../include/graphics.h> -/* [NAC HACK 2016May11] should be able to get rid of all of this */ -struct pty { - unsigned char *base; /* base of buffer in cpu space */ - unsigned char *cpos; /* current location of cursor */ - unsigned char csave; /* charactor that is under the cursor */ - struct vt_switch vt; /* the vt.o module's state */ - unsigned int scrloc; /* location to put into gimme */ - unsigned char vmod; /* video mode */ - unsigned char vres; /* video register settings of this tty */ - unsigned char width; /* text width of screen */ - unsigned char height; /* text height */ - unsigned char right; /* right most coord */ - unsigned char bottom; /* bottom most coord */ - struct display *fdisp; /* ptr to struct for ioctl */ - uint8_t attr; /* attribute byte to apply */ -}; - -extern struct pty *curpty; - int my_tty_close( uint8_t minor ); /* wrapper call to close DW ports */ #endif -- 2.34.1