Removing PCCONS_SUPPORT for NetBSD

[Alexandr Shadchin <alexandr.shadchin%gmail.com@localhost>]

Hi!

Subject. Does anyone should object?
As I see it, NetBSD is not using pccons.

-- 
Alexandr Shadchin

From 22075150674feed748733f3587a338864bf66dea Mon Sep 17 00:00:00 2001
From: Alexandr Shadchin <Alexandr.Shadchin%gmail.com@localhost>
Date: Wed, 1 Dec 2010 00:19:38 +0500
Subject: [PATCH xserver] Removing PCCONS_SUPPORT for NetBSD

Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin%gmail.com@localhost>
---
 configure.ac                           |    1 -
 hw/xfree86/os-support/bsd/i386_video.c |   55 --------------------------------
 hw/xfree86/os-support/xf86_OSproc.h    |    4 --
 3 files changed, 0 insertions(+), 60 deletions(-)

diff --git a/configure.ac b/configure.ac
index bd027cd..93fc6df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -418,7 +418,6 @@ case $host_os in
        ;;
   *netbsd*)
        AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
-       AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
        AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
        AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
        DRI=yes
diff --git a/hw/xfree86/os-support/bsd/i386_video.c 
b/hw/xfree86/os-support/bsd/i386_video.c
index 7aef079..ffaf366 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -444,61 +444,6 @@ xf86DisableIO()
 
 #endif
 
-#ifdef __NetBSD__
-/***************************************************************************/
-/* Set TV output mode                                                      */
-/***************************************************************************/
-void
-xf86SetTVOut(int mode)
-{    
-    switch (xf86Info.consType)
-    {
-#ifdef PCCONS_SUPPORT
-       case PCCONS:{
-
-           if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0)
-           {
-               xf86Msg(X_WARNING,
-                   "xf86SetTVOut: Could not set console to TV output, %s\n",
-                   strerror(errno));
-           }
-       }
-       break;
-#endif /* PCCONS_SUPPORT */
-
-       default:
-           FatalError("Xf86SetTVOut: Unsupported console");
-           break; 
-    }
-    return;
-}
-
-void
-xf86SetRGBOut()
-{    
-    switch (xf86Info.consType)
-    {
-#ifdef PCCONS_SUPPORT
-       case PCCONS:{
-           
-           if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0)
-           {
-               xf86Msg(X_WARNING,
-                   "xf86SetTVOut: Could not set console to RGB output, %s\n",
-                   strerror(errno));
-           }
-       }
-       break;
-#endif /* PCCONS_SUPPORT */
-
-       default:
-           FatalError("Xf86SetTVOut: Unsupported console");
-           break; 
-    }
-    return;
-}
-#endif
-
 #ifdef HAS_MTRR_SUPPORT
 /* memory range (MTRR) support for FreeBSD */
 
diff --git a/hw/xfree86/os-support/xf86_OSproc.h 
b/hw/xfree86/os-support/xf86_OSproc.h
index f0cb768..9bbf936 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -138,10 +138,6 @@ extern _X_EXPORT void xf86MapReadSideEffects(int, int, 
pointer, unsigned long);
 extern _X_EXPORT int xf86ReadBIOS(unsigned long, unsigned long, unsigned char 
*, int);
 extern _X_EXPORT Bool xf86EnableIO(void);
 extern _X_EXPORT void xf86DisableIO(void);
-#ifdef __NetBSD__
-extern _X_EXPORT void xf86SetTVOut(int);
-extern _X_EXPORT void xf86SetRGBOut(void);
-#endif
 extern _X_EXPORT void xf86OSRingBell(int, int, int);
 extern _X_EXPORT void xf86SetReallySlowBcopy(void);
 extern _X_EXPORT void xf86SlowBcopy(unsigned char *, unsigned char *, int);
-- 
1.7.3.2

From b145c617d9bf8ba384049bcb73fdd3515bd906e1 Mon Sep 17 00:00:00 2001
From: Alexandr Shadchin <Alexandr.Shadchin%gmail.com@localhost>
Date: Wed, 1 Dec 2010 00:12:18 +0500
Subject: [PATCH] Removing PCCONS_SUPPORT for NetBSD

Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin%gmail.com@localhost>
---
 src/ct_driver.c |   26 --------------------------
 1 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/src/ct_driver.c b/src/ct_driver.c
index 97031ef..2c29377 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -5803,32 +5803,6 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
            ChipsNew->CR[0x70] &= ~0x80;        /* unset interlace */
        }
     }
-    
-#if defined(__arm32__) && defined(__NetBSD__)
-    if (cPtr->TVMode != XMODE_RGB) {
-       /*
-        * Put the console into TV Out mode.
-        */
-       xf86SetTVOut(cPtr->TVMode);
-       
-       ChipsNew->CR[0x72] = (mode->CrtcHTotal >> 1) >> 3;/* First horizontal
-                                                          * serration pulse */
-       ChipsNew->CR[0x73] = mode->CrtcHTotal >> 3; /* Second pulse */
-       ChipsNew->CR[0x74] = (((mode->HSyncEnd - mode->HSyncStart) >> 3) - 1)
-                                       & 0x1F; /* equalization pulse */
-       
-       if (cPtr->TVMode == XMODE_PAL || cPtr->TVMode == XMODE_SECAM) {
-           ChipsNew->CR[0x71] = 0xA0; /* PAL support with blanking delay */
-       } else {
-           ChipsNew->CR[0x71] = 0x20; /* NTSC support with blanking delay */
-       }
-    } else {   /* XMODE_RGB */
-       /*
-        * Put the console into RGB Out mode.
-        */
-       xf86SetRGBOut();
-    }
-#endif
 
     /* STN specific */
     if (IS_STN(cPtr->PanelType)) {
-- 
1.7.3.2