More stuff to revert wrt ucom console.

Author: skrll

sys/arch/x86/x86/consinit.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: consinit.c,v 1.42 2025/10/10 13:18:18 manu Exp $	*/
+/*	$NetBSD: consinit.c,v 1.43 2025/10/10 18:15:10 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.42 2025/10/10 13:18:18 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.43 2025/10/10 18:15:10 skrll Exp $");
 
 #include "opt_kgdb.h"
 #include "opt_puc.h"
@@ -87,11 +87,6 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.42 2025/10/10 13:18:18 manu Exp $");
 #include <dev/pci/puccn.h>
 #endif
 
-#include "ucom.h"
-#if (NUCOM > 0)
-#include <dev/usb/ucomvar.h>
-#endif
-
 #include "ukbd.h"
 #if (NUKBD > 0)
 #include <dev/usb/ukbdvar.h>
@@ -289,18 +284,6 @@ consinit(void)
 				 COM_FREQ, COM_TYPE_NORMAL, comcnmode);
 		if (rv != 0)
 			panic("can't init serial console @%x", consinfo->addr);
-
-		return;
-	}
-#endif
-#if (NUCOM > 0)
-	if (!strcmp(console_devname, "ucom")) {
-		int unit = consinfo->addr;
-		int speed = consinfo->speed;
-
-		if (ucom_cnattach(unit, speed) != 0)
-			panic("can't init console %s", console_devname);
-
 		return;
 	}
 #endif

sys/dev/usb/ucomvar.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ucomvar.h,v 1.24 2025/10/10 13:14:35 manu Exp $	*/
+/*	$NetBSD: ucomvar.h,v 1.25 2025/10/10 18:15:11 skrll Exp $	*/
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -164,4 +164,3 @@ struct ucom_attach_args {
 int ucomprint(void *, const char *);
 int ucomsubmatch(device_t t, cfdata_t, const int *, void *);
 void ucom_status_change(struct ucom_softc *);
-int ucom_cnattach(int, int);