Merge pull request #1998 from ghaerr/meta

[drivers] Remove unfinished Meta/UDD driver
ghaerr · Sep 5, 2024 · 0d262da · 0d262da
2 parents 295e9ec + 6dfa3ab
commit 0d262da
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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 → elks/arch/i86/drivers/char/unused/meta.c b/elks/arch/i86/drivers/char/meta.c → elks/arch/i86/drivers/char/unused/meta.c
diff --git a/elks/include/linuxmt/udd.h → elks/arch/i86/drivers/char/unused/udd.h b/elks/include/linuxmt/udd.h → elks/arch/i86/drivers/char/unused/udd.h
diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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