From 6dfa3ab0e79ca7d3d0e5f5f77a6456af60261bac Mon Sep 17 00:00:00 2001 From: Greg Haerr Date: Wed, 4 Sep 2024 19:44:47 -0600 Subject: [PATCH] [drivers] Remove unfinished Meta/UDD driver --- elks/arch/i86/drivers/char/Makefile | 2 +- elks/arch/i86/drivers/char/config.in | 1 - elks/arch/i86/drivers/char/init.c | 4 ---- elks/arch/i86/drivers/char/{ => unused}/meta.c | 0 elks/{include/linuxmt => arch/i86/drivers/char/unused}/udd.h | 0 elks/include/linuxmt/major.h | 4 ++-- 6 files changed, 3 insertions(+), 8 deletions(-) rename elks/arch/i86/drivers/char/{ => unused}/meta.c (100%) rename elks/{include/linuxmt => arch/i86/drivers/char/unused}/udd.h (100%) diff --git a/elks/arch/i86/drivers/char/Makefile b/elks/arch/i86/drivers/char/Makefile index 504137465..b40a38ce3 100644 --- a/elks/arch/i86/drivers/char/Makefile +++ b/elks/arch/i86/drivers/char/Makefile @@ -35,7 +35,7 @@ include $(BASEDIR)/Makefile-rules ######################################################################### # Objects to be compiled. -OBJS = init.o mem.o ntty.o meta.o tcpdev.o pty.o lp.o +OBJS = init.o mem.o ntty.o tcpdev.o pty.o lp.o ifeq ($(CONFIG_ETH), y) OBJS += eth.o diff --git a/elks/arch/i86/drivers/char/config.in b/elks/arch/i86/drivers/char/config.in index 0ae56535a..bad145cc4 100644 --- a/elks/arch/i86/drivers/char/config.in +++ b/elks/arch/i86/drivers/char/config.in @@ -36,5 +36,4 @@ mainmenu_option next_comment #fi bool 'Pseudo tty device driver' CONFIG_PSEUDO_TTY y - #bool 'Meta device driver' CONFIG_DEV_META n endmenu diff --git a/elks/arch/i86/drivers/char/init.c b/elks/arch/i86/drivers/char/init.c index c2e7ed806..46190b799 100644 --- a/elks/arch/i86/drivers/char/init.c +++ b/elks/arch/i86/drivers/char/init.c @@ -16,10 +16,6 @@ void INITPROC chr_dev_init(void) mem_dev_init(); #endif -#ifdef CONFIG_DEV_META - meta_init(); -#endif - #ifdef CONFIG_INET tcpdev_init(); #endif diff --git a/elks/arch/i86/drivers/char/meta.c b/elks/arch/i86/drivers/char/unused/meta.c similarity index 100% rename from elks/arch/i86/drivers/char/meta.c rename to elks/arch/i86/drivers/char/unused/meta.c diff --git a/elks/include/linuxmt/udd.h b/elks/arch/i86/drivers/char/unused/udd.h similarity index 100% rename from elks/include/linuxmt/udd.h rename to elks/arch/i86/drivers/char/unused/udd.h diff --git a/elks/include/linuxmt/major.h b/elks/include/linuxmt/major.h index abdc7907c..6b668c0f3 100644 --- a/elks/include/linuxmt/major.h +++ b/elks/include/linuxmt/major.h @@ -24,7 +24,7 @@ * 4 - /dev/tty*,ttyp*,ttyS* /dev/f{0,1} char tty, pty slave, serial, block fd * 5 - * 6 - /dev/lp /dev/rom char lp, block romflash - * 7 - /dev/ucd /dev/ubd meta UDD user device drivers + * 7 - * 8 - /dev/tcpdev kernel <-> ktcp comm * 9 - /dev/eth NIC driver * 10 - /dev/cgatext @@ -40,7 +40,7 @@ #define TTY_MAJOR 4 /* 5 unused*/ #define LP_MAJOR 6 -#define UDD_MAJOR 7 /* experimental*/ + /* 7 unused*/ #define TCPDEV_MAJOR 8 #define ETH_MAJOR 9 #define CGATEXT_MAJOR 10