CVS commit: src/sys/arch/i386/xbox

2011-07-01 Thread David Young 
Module Name:src
Committed By:   dyoung
Date:   Fri Jul  1 18:16:30 UTC 2011

Modified Files:
src/sys/arch/i386/xbox: xbox.c xboxfb.c xboxlcd.c

Log Message:
#include sys/bus.h instead of machine/bus.h.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/xbox/xbox.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/xbox/xboxfb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/xbox/xboxlcd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/i386/xbox/xbox.c
diff -u src/sys/arch/i386/xbox/xbox.c:1.5 src/sys/arch/i386/xbox/xbox.c:1.6
--- src/sys/arch/i386/xbox/xbox.c:1.5	Wed Apr 28 19:17:04 2010
+++ src/sys/arch/i386/xbox/xbox.c	Fri Jul  1 18:16:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xbox.c,v 1.5 2010/04/28 19:17:04 dyoung Exp $ */
+/* $NetBSD: xbox.c,v 1.6 2011/07/01 18:16:30 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -31,13 +31,13 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xbox.c,v 1.5 2010/04/28 19:17:04 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: xbox.c,v 1.6 2011/07/01 18:16:30 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
 #include sys/device.h
 
-#include machine/bus.h
+#include sys/bus.h
 
 #include arch/i386/include/xbox.h
 

Index: src/sys/arch/i386/xbox/xboxfb.c
diff -u src/sys/arch/i386/xbox/xboxfb.c:1.14 src/sys/arch/i386/xbox/xboxfb.c:1.15
--- src/sys/arch/i386/xbox/xboxfb.c:1.14	Thu Dec 16 07:59:10 2010
+++ src/sys/arch/i386/xbox/xboxfb.c	Fri Jul  1 18:16:30 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: xboxfb.c,v 1.14 2010/12/16 07:59:10 cegger Exp $	*/
+/*	$NetBSD: xboxfb.c,v 1.15 2011/07/01 18:16:30 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xboxfb.c,v 1.14 2010/12/16 07:59:10 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: xboxfb.c,v 1.15 2011/07/01 18:16:30 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -46,7 +46,7 @@
 
 #include uvm/uvm_extern.h
 /* #include machine/autoconf.h */
-#include machine/bus.h
+#include sys/bus.h
 #include machine/xbox.h
 
 #include dev/pci/pcivar.h

Index: src/sys/arch/i386/xbox/xboxlcd.c
diff -u src/sys/arch/i386/xbox/xboxlcd.c:1.3 src/sys/arch/i386/xbox/xboxlcd.c:1.4
--- src/sys/arch/i386/xbox/xboxlcd.c:1.3	Tue Dec 11 12:00:56 2007
+++ src/sys/arch/i386/xbox/xboxlcd.c	Fri Jul  1 18:16:30 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: xboxlcd.c,v 1.3 2007/12/11 12:00:56 lukem Exp $	*/
+/*	$NetBSD: xboxlcd.c,v 1.4 2011/07/01 18:16:30 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2006 Andrew Gillham
@@ -33,12 +33,12 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xboxlcd.c,v 1.3 2007/12/11 12:00:56 lukem Exp $);
+__KERNEL_RCSID(0, $NetBSD: xboxlcd.c,v 1.4 2011/07/01 18:16:30 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
 #include sys/kernel.h
-#include machine/bus.h
+#include sys/bus.h
 #include machine/xbox.h
 #include machine/pio.h

CVS commit: src/sys/arch/i386/xbox

2010-12-15 Thread Christoph Egger 
Module Name:src
Committed By:   cegger
Date:   Thu Dec 16 07:59:10 UTC 2010

Modified Files:
src/sys/arch/i386/xbox: xboxfb.c

Log Message:
ioctl: KNF switch-case


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/xbox/xboxfb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/i386/xbox/xboxfb.c
diff -u src/sys/arch/i386/xbox/xboxfb.c:1.13 src/sys/arch/i386/xbox/xboxfb.c:1.14
--- src/sys/arch/i386/xbox/xboxfb.c:1.13	Wed Apr 28 19:17:04 2010
+++ src/sys/arch/i386/xbox/xboxfb.c	Thu Dec 16 07:59:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: xboxfb.c,v 1.13 2010/04/28 19:17:04 dyoung Exp $	*/
+/*	$NetBSD: xboxfb.c,v 1.14 2010/12/16 07:59:10 cegger Exp $	*/
 
 /*
  * Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xboxfb.c,v 1.13 2010/04/28 19:17:04 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: xboxfb.c,v 1.14 2010/12/16 07:59:10 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -244,40 +244,39 @@
 	struct vcons_screen *ms = vd-active;
 
 	switch (cmd) {
-		case WSDISPLAYIO_GTYPE:
-			*(u_int *)data = WSDISPLAY_TYPE_PCIMISC;
-			return 0;
-
-		case WSDISPLAYIO_GINFO:
-			wdf = (void *)data;
-			wdf-height = xboxfb_console_height;
-			wdf-width = xboxfb_console_width;
-			wdf-depth = ms-scr_ri.ri_depth;
-			wdf-cmsize = 256;
-			return 0;
-
-		case WSDISPLAYIO_GETCMAP:
-			return EINVAL;
-
-		case WSDISPLAYIO_PUTCMAP:
-			return EINVAL;
-
-		case WSDISPLAYIO_LINEBYTES:
-			*(u_int *)data = ms-scr_ri.ri_stride;
-			return 0;
-
-		case WSDISPLAYIO_SMODE:
-			{
-int new_mode = *(int *)data;
-if (new_mode != sc-sc_mode) {
-	sc-sc_mode = new_mode;
-	if (new_mode == WSDISPLAYIO_MODE_EMUL) {
-		xboxfb_clear_fb(sc);
-		vcons_redraw_screen(vd-active);
-	}
+	case WSDISPLAYIO_GTYPE:
+		*(u_int *)data = WSDISPLAY_TYPE_PCIMISC;
+		return 0;
+
+	case WSDISPLAYIO_GINFO:
+		wdf = (void *)data;
+		wdf-height = xboxfb_console_height;
+		wdf-width = xboxfb_console_width;
+		wdf-depth = ms-scr_ri.ri_depth;
+		wdf-cmsize = 256;
+		return 0;
+
+	case WSDISPLAYIO_GETCMAP:
+		return EINVAL;
+
+	case WSDISPLAYIO_PUTCMAP:
+		return EINVAL;
+
+	case WSDISPLAYIO_LINEBYTES:
+		*(u_int *)data = ms-scr_ri.ri_stride;
+		return 0;
+
+	case WSDISPLAYIO_SMODE: {
+			int new_mode = *(int *)data;
+			if (new_mode != sc-sc_mode) {
+sc-sc_mode = new_mode;
+if (new_mode == WSDISPLAYIO_MODE_EMUL) {
+	xboxfb_clear_fb(sc);
+	vcons_redraw_screen(vd-active);
 }
 			}
-			return 0;
+		}
+		return 0;
 	}
 	return EPASSTHROUGH;
 }