Re: Remove WSDISPLAY_COMPAT_SYSCONS

[Miod Vallat]

> jmc@ stumbled over this.  The WSDISPLAY_COMPAT_SYSCONS option was
> only ever in i386 GENERIC and it has been disabled there for 15
> years, so I think we can safely delete it, whatever it was used for
> (running FreeBSD X11 server binaries??).

Not really. The native X server used to issue these very same ioctls
until about 10 years ago. So while it's safe to get rid of this, this
code had never been used to run non-native X servers.

Re: Remove WSDISPLAY_COMPAT_SYSCONS

[Mike Larkin]

On Thu, Mar 03, 2016 at 05:30:05PM +0100, Christian Weisgerber wrote:
> jmc@ stumbled over this.  The WSDISPLAY_COMPAT_SYSCONS option was
> only ever in i386 GENERIC and it has been disabled there for 15
> years, so I think we can safely delete it, whatever it was used for
> (running FreeBSD X11 server binaries??).

ok mlarkin

> 
> Index: sys/dev/wscons/wsdisplay_compat_usl.c
> ===
> RCS file: /cvs/src/sys/dev/wscons/wsdisplay_compat_usl.c,v
> retrieving revision 1.28
> diff -u -p -r1.28 wsdisplay_compat_usl.c
> --- sys/dev/wscons/wsdisplay_compat_usl.c 8 Sep 2015 11:13:20 -   
> 1.28
> +++ sys/dev/wscons/wsdisplay_compat_usl.c 3 Mar 2016 15:01:53 -
> @@ -330,11 +330,6 @@ wsdisplay_usl_ioctl1(struct wsdisplay_so
>  #undef id
>   return (0);
>  #endif
> -#ifdef WSDISPLAY_COMPAT_SYSCONS
> - case CONS_GETVERS:
> - *(int *)data = 0x200;/* version 2.0 */
> - return (0);
> -#endif
>  
>   default:
>   return (-1);
> Index: sys/dev/wscons/wsdisplay_usl_io.h
> ===
> RCS file: /cvs/src/sys/dev/wscons/wsdisplay_usl_io.h,v
> retrieving revision 1.2
> diff -u -p -r1.2 wsdisplay_usl_io.h
> --- sys/dev/wscons/wsdisplay_usl_io.h 6 Jul 2006 18:20:45 -   1.2
> +++ sys/dev/wscons/wsdisplay_usl_io.h 3 Mar 2016 15:07:22 -
> @@ -78,6 +78,3 @@ struct pcvtid {
>   int rmajor; /* revision number, major   */
>   int rminor; /* revision number, minor   */
>  };
> -
> -/* syscons compatibility */
> -#define CONS_GETVERS _IOR('c', 74, int)
> Index: share/man/man4/wscons.4
> ===
> RCS file: /cvs/src/share/man/man4/wscons.4,v
> retrieving revision 1.19
> diff -u -p -r1.19 wscons.4
> --- share/man/man4/wscons.4   28 Feb 2016 16:07:57 -  1.19
> +++ share/man/man4/wscons.4   3 Mar 2016 15:03:15 -
> @@ -38,7 +38,6 @@
>  .Cd option WS_KERNEL_FG=WSCOL_XXX
>  .Cd option WS_KERNEL_BG=WSCOL_XXX
>  .Cd option WSDISPLAY_COMPAT_PCVT
> -.Cd option WSDISPLAY_COMPAT_SYSCONS
>  .Cd option WSDISPLAY_COMPAT_USL
>  .Cd option WSDISPLAY_COMPAT_RAWKBD
>  .Pp
> @@ -201,11 +200,6 @@ Emulates enough of the
>  .Ox
>  / i386
>  .Dq pcvt
> -driver to make X servers work.
> -.It Cd WSDISPLAY_COMPAT_SYSCONS
> -Emulates enough of the i386
> -.Fx
> -.Dq syscons
>  driver to make X servers work.
>  .El
>  .Pp
> -- 
> Christian "naddy" Weisgerber  na...@mips.inka.de
> 

Re: Remove WSDISPLAY_COMPAT_SYSCONS

[Mark Kettenis]

> Date: Thu, 3 Mar 2016 17:30:05 +0100
> From: Christian Weisgerber 
> 
> jmc@ stumbled over this.  The WSDISPLAY_COMPAT_SYSCONS option was
> only ever in i386 GENERIC and it has been disabled there for 15
> years, so I think we can safely delete it, whatever it was used for
> (running FreeBSD X11 server binaries??).

Yes please.

ok kettenis@

> Index: sys/dev/wscons/wsdisplay_compat_usl.c
> ===
> RCS file: /cvs/src/sys/dev/wscons/wsdisplay_compat_usl.c,v
> retrieving revision 1.28
> diff -u -p -r1.28 wsdisplay_compat_usl.c
> --- sys/dev/wscons/wsdisplay_compat_usl.c 8 Sep 2015 11:13:20 -   
> 1.28
> +++ sys/dev/wscons/wsdisplay_compat_usl.c 3 Mar 2016 15:01:53 -
> @@ -330,11 +330,6 @@ wsdisplay_usl_ioctl1(struct wsdisplay_so
>  #undef id
>   return (0);
>  #endif
> -#ifdef WSDISPLAY_COMPAT_SYSCONS
> - case CONS_GETVERS:
> - *(int *)data = 0x200;/* version 2.0 */
> - return (0);
> -#endif
>  
>   default:
>   return (-1);
> Index: sys/dev/wscons/wsdisplay_usl_io.h
> ===
> RCS file: /cvs/src/sys/dev/wscons/wsdisplay_usl_io.h,v
> retrieving revision 1.2
> diff -u -p -r1.2 wsdisplay_usl_io.h
> --- sys/dev/wscons/wsdisplay_usl_io.h 6 Jul 2006 18:20:45 -   1.2
> +++ sys/dev/wscons/wsdisplay_usl_io.h 3 Mar 2016 15:07:22 -
> @@ -78,6 +78,3 @@ struct pcvtid {
>   int rmajor; /* revision number, major   */
>   int rminor; /* revision number, minor   */
>  };
> -
> -/* syscons compatibility */
> -#define CONS_GETVERS _IOR('c', 74, int)
> Index: share/man/man4/wscons.4
> ===
> RCS file: /cvs/src/share/man/man4/wscons.4,v
> retrieving revision 1.19
> diff -u -p -r1.19 wscons.4
> --- share/man/man4/wscons.4   28 Feb 2016 16:07:57 -  1.19
> +++ share/man/man4/wscons.4   3 Mar 2016 15:03:15 -
> @@ -38,7 +38,6 @@
>  .Cd option WS_KERNEL_FG=WSCOL_XXX
>  .Cd option WS_KERNEL_BG=WSCOL_XXX
>  .Cd option WSDISPLAY_COMPAT_PCVT
> -.Cd option WSDISPLAY_COMPAT_SYSCONS
>  .Cd option WSDISPLAY_COMPAT_USL
>  .Cd option WSDISPLAY_COMPAT_RAWKBD
>  .Pp
> @@ -201,11 +200,6 @@ Emulates enough of the
>  .Ox
>  / i386
>  .Dq pcvt
> -driver to make X servers work.
> -.It Cd WSDISPLAY_COMPAT_SYSCONS
> -Emulates enough of the i386
> -.Fx
> -.Dq syscons
>  driver to make X servers work.
>  .El
>  .Pp
> -- 
> Christian "naddy" Weisgerber  na...@mips.inka.de
> 
> 

Remove WSDISPLAY_COMPAT_SYSCONS

[Christian Weisgerber]

jmc@ stumbled over this.  The WSDISPLAY_COMPAT_SYSCONS option was
only ever in i386 GENERIC and it has been disabled there for 15
years, so I think we can safely delete it, whatever it was used for
(running FreeBSD X11 server binaries??).

Index: sys/dev/wscons/wsdisplay_compat_usl.c
===
RCS file: /cvs/src/sys/dev/wscons/wsdisplay_compat_usl.c,v
retrieving revision 1.28
diff -u -p -r1.28 wsdisplay_compat_usl.c
--- sys/dev/wscons/wsdisplay_compat_usl.c   8 Sep 2015 11:13:20 -   
1.28
+++ sys/dev/wscons/wsdisplay_compat_usl.c   3 Mar 2016 15:01:53 -
@@ -330,11 +330,6 @@ wsdisplay_usl_ioctl1(struct wsdisplay_so
 #undef id
return (0);
 #endif
-#ifdef WSDISPLAY_COMPAT_SYSCONS
-   case CONS_GETVERS:
-   *(int *)data = 0x200;/* version 2.0 */
-   return (0);
-#endif
 
default:
return (-1);
Index: sys/dev/wscons/wsdisplay_usl_io.h
===
RCS file: /cvs/src/sys/dev/wscons/wsdisplay_usl_io.h,v
retrieving revision 1.2
diff -u -p -r1.2 wsdisplay_usl_io.h
--- sys/dev/wscons/wsdisplay_usl_io.h   6 Jul 2006 18:20:45 -   1.2
+++ sys/dev/wscons/wsdisplay_usl_io.h   3 Mar 2016 15:07:22 -
@@ -78,6 +78,3 @@ struct pcvtid {
int rmajor; /* revision number, major   */
int rminor; /* revision number, minor   */
 };
-
-/* syscons compatibility */
-#define CONS_GETVERS   _IOR('c', 74, int)
Index: share/man/man4/wscons.4
===
RCS file: /cvs/src/share/man/man4/wscons.4,v
retrieving revision 1.19
diff -u -p -r1.19 wscons.4
--- share/man/man4/wscons.4 28 Feb 2016 16:07:57 -  1.19
+++ share/man/man4/wscons.4 3 Mar 2016 15:03:15 -
@@ -38,7 +38,6 @@
 .Cd option WS_KERNEL_FG=WSCOL_XXX
 .Cd option WS_KERNEL_BG=WSCOL_XXX
 .Cd option WSDISPLAY_COMPAT_PCVT
-.Cd option WSDISPLAY_COMPAT_SYSCONS
 .Cd option WSDISPLAY_COMPAT_USL
 .Cd option WSDISPLAY_COMPAT_RAWKBD
 .Pp
@@ -201,11 +200,6 @@ Emulates enough of the
 .Ox
 / i386
 .Dq pcvt
-driver to make X servers work.
-.It Cd WSDISPLAY_COMPAT_SYSCONS
-Emulates enough of the i386
-.Fx
-.Dq syscons
 driver to make X servers work.
 .El
 .Pp
-- 
Christian "naddy" Weisgerber  na...@mips.inka.de