Reduce diff with upstream.

2 files changed, 50 insertions, 48 deletions

diff --git a/xserver/hw/xfree86/os-support/bsd/bsd_init.c b/xserver/hw/xfree86/os-support/bsd/bsd_init.c
index f19af5e9a..319d98cfc 100644
--- a/xserver/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/xserver/hw/xfree86/os-support/bsd/bsd_init.c
@@ -430,7 +430,7 @@ xf86OpenSyscons(void)
                         xf86Info.vtno = -1;
                     }
 #if 0
-            }
+                }
 #endif
 
                 if (xf86Info.vtno == -1) {
@@ -458,11 +458,8 @@ xf86OpenSyscons(void)
             }
 
             close(fd);
-#ifndef __OpenBSD__
-            snprintf(vtname, sizeof(vtname), "/dev/ttyv%01x", xf86Info.vtno - 1);
-#else
-            sprintf(vtname, sizeof(vtname), "/dev/ttyC%01x", xf86Info.vtno - 1);
-#endif
+            snprintf(vtname, sizeof(vtname), "/dev/ttyv%01x",
+                     xf86Info.vtno - 1);
             if ((fd = open(vtname, SYSCONS_CONSOLE_MODE, 0)) < 0) {
                 FatalError("xf86OpenSyscons: Cannot open %s (%s)",
                            vtname, strerror(errno));
@@ -525,7 +522,7 @@ xf86OpenPcvt(void)
 #endif
     if (fd >= 0) {
         if (ioctl(fd, VGAPCVTID, &pcvt_version) >= 0) {
-            if(ioctl(fd, VT_GETMODE, &vtmode) < 0) {
+            if (ioctl(fd, VT_GETMODE, &vtmode) < 0) {
                 FatalError("%s: VT_GETMODE failed\n%s%s\n%s",
                            "xf86OpenPcvt",
                            "Found pcvt driver but X11 seems to be",
@@ -551,22 +548,23 @@ xf86OpenPcvt(void)
                         xf86Info.vtno = initialVT;
                     }
                     else {
-                        FatalError("%s: Cannot find a free VT",
-                                   "xf86OpenPcvt");
+                        FatalError("%s: Cannot find a free VT", "xf86OpenPcvt");
                     }
                 }
             }
 
             close(fd);
-            snprintf(vtname, sizeof(vtname), "%s%01x", vtprefix, xf86Info.vtno - 1);
+            snprintf(vtname, sizeof(vtname), "%s%01x", vtprefix,
+                     xf86Info.vtno - 1);
             if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0) {
                 ErrorF("xf86OpenPcvt: Cannot open %s (%s)",
                        vtname, strerror(errno));
                 xf86Info.vtno = initialVT;
-                snprintf(vtname, sizeof(vtname), "%s%01x", vtprefix, xf86Info.vtno - 1);
+                snprintf(vtname, sizeof(vtname), "%s%01x", vtprefix,
+                         xf86Info.vtno - 1);
                 if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0) {
                     FatalError("xf86OpenPcvt: Cannot open %s (%s)",
-                                vtname, strerror(errno));
+                               vtname, strerror(errno));
                 }
             }
             if (ioctl(fd, VT_GETMODE, &vtmode) < 0) {
diff --git a/xserver/hw/xfree86/os-support/bsd/i386_video.c b/xserver/hw/xfree86/os-support/bsd/i386_video.c
index 4beca8618..9a5c7e55b 100644
--- a/xserver/hw/xfree86/os-support/bsd/i386_video.c
+++ b/xserver/hw/xfree86/os-support/bsd/i386_video.c
@@ -83,11 +83,11 @@ checkDevMem(Bool warn)
     /* Try the aperture driver first */
     if ((fd = open(DEV_APERTURE, O_RDWR)) >= 0) {
         /* Try to map a page at the VGA address */
-        base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
-                    MAP_FLAGS, fd, (off_t)0xA0000);
-        
+        base = mmap((caddr_t) 0, 4096, PROT_READ | PROT_WRITE,
+                    MAP_FLAGS, fd, (off_t) 0xA0000);
+
         if (base != MAP_FAILED) {
-            munmap((caddr_t)base, 4096);
+            munmap((caddr_t) base, 4096);
             devMemFd = fd;
             useDevMem = TRUE;
             xf86Msg(X_PROBED, "checkDevMem: using aperture driver %s\n",
@@ -104,16 +104,17 @@ checkDevMem(Bool warn)
 #endif
     if ((fd = open(DEV_MEM, O_RDWR)) >= 0) {
         /* Try to map a page at the VGA address */
-        base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
-                    MAP_FLAGS, fd, (off_t)0xA0000);
-        
+        base = mmap((caddr_t) 0, 4096, PROT_READ | PROT_WRITE,
+                    MAP_FLAGS, fd, (off_t) 0xA0000);
+
         if (base != MAP_FAILED) {
-            munmap((caddr_t)base, 4096);
+            munmap((caddr_t) base, 4096);
             devMemFd = fd;
             useDevMem = TRUE;
             return;
         }
         else {
+
             if (warn) {
                 xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
                         DEV_MEM, strerror(errno));
@@ -128,17 +129,19 @@ checkDevMem(Bool warn)
 #else
 #ifndef __OpenBSD__
         xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
-		"\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno));
+		"\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno));
 #else /* __OpenBSD__ */
         xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
-                "\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno),
+                "\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno),
                 SYSCTL_MSG);
 #endif /* __OpenBSD__ */
         
         xf86ErrorF("\tlinear framebuffer access unavailable\n");
     }
+
     useDevMem = FALSE;
     return;
+
 #endif
 }
 
@@ -148,6 +151,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
     checkDevMem(TRUE);
 
     pci_system_init_dev_mem(devMemFd);
+
     pVidMem->initialised = TRUE;
 }
 
@@ -228,13 +232,13 @@ xf86DisableIO(void)
 {
     if (!ExtendedEnabled)
         return;
-    
+
     if (amd64_iopl(FALSE) == 0) {
         ExtendedEnabled = FALSE;
     }
     /* Otherwise, the X server has revoqued its root uid,
        and thus cannot give up IO privileges any more */
-    
+
     return;
 }
 
@@ -279,18 +283,18 @@ 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:
+    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;
     }
@@ -302,18 +306,18 @@ xf86SetRGBOut(void)
 {
     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:
+    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;
     }