Sun Feb 14 19:11:20 2016 UTC ()
Remove extra stray break missed by Christos when committing PR 50783.


(dholland)
diff -r1.42 -r1.43 src/sys/arch/sgimips/dev/crmfb.c
cvs diff -r1.42 -r1.43 src/sys/arch/sgimips/dev/crmfb.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/dev/crmfb.c 2016/02/08 16:44:45 1.42
+++ src/sys/arch/sgimips/dev/crmfb.c 2016/02/14 19:11:19 1.43
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: crmfb.c,v 1.42 2016/02/08 16:44:45 christos Exp $ */ 1/* $NetBSD: crmfb.c,v 1.43 2016/02/14 19:11:19 dholland Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca> 4 * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
5 * 2008 Michael Lorenz <macallan@netbsd.org> 5 * 2008 Michael Lorenz <macallan@netbsd.org>
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -22,27 +22,27 @@ @@ -22,27 +22,27 @@
22 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 22 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27 * POSSIBILITY OF SUCH DAMAGE. 27 * POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30/* 30/*
31 * SGI-CRM (O2) Framebuffer driver 31 * SGI-CRM (O2) Framebuffer driver
32 */ 32 */
33 33
34#include <sys/cdefs.h> 34#include <sys/cdefs.h>
35__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.42 2016/02/08 16:44:45 christos Exp $"); 35__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.43 2016/02/14 19:11:19 dholland Exp $");
36 36
37#include <sys/param.h> 37#include <sys/param.h>
38#include <sys/systm.h> 38#include <sys/systm.h>
39#include <sys/device.h> 39#include <sys/device.h>
40#include <sys/malloc.h> 40#include <sys/malloc.h>
41 41
42#include <machine/autoconf.h> 42#include <machine/autoconf.h>
43#include <sys/bus.h> 43#include <sys/bus.h>
44#include <machine/machtype.h> 44#include <machine/machtype.h>
45#include <machine/vmparam.h> 45#include <machine/vmparam.h>
46 46
47#include <dev/arcbios/arcbios.h> 47#include <dev/arcbios/arcbios.h>
48#include <dev/arcbios/arcbiosvar.h> 48#include <dev/arcbios/arcbiosvar.h>
@@ -1118,27 +1118,26 @@ crmfb_setup_video(struct crmfb_softc *sc @@ -1118,27 +1118,26 @@ crmfb_setup_video(struct crmfb_softc *sc
1118 break; 1118 break;
1119 case 16: 1119 case 16:
1120 sc->sc_de_mode = DE_MODE_TLB_A | DE_MODE_BUFDEPTH_16 | 1120 sc->sc_de_mode = DE_MODE_TLB_A | DE_MODE_BUFDEPTH_16 |
1121 DE_MODE_TYPE_RGBA | DE_MODE_PIXDEPTH_16; 1121 DE_MODE_TYPE_RGBA | DE_MODE_PIXDEPTH_16;
1122 sc->sc_mte_mode = MTE_MODE_DST_ECC | 1122 sc->sc_mte_mode = MTE_MODE_DST_ECC |
1123 (MTE_TLB_A << MTE_DST_TLB_SHIFT) | 1123 (MTE_TLB_A << MTE_DST_TLB_SHIFT) |
1124 (MTE_TLB_A << MTE_SRC_TLB_SHIFT) | 1124 (MTE_TLB_A << MTE_SRC_TLB_SHIFT) |
1125 (MTE_DEPTH_16 << MTE_DEPTH_SHIFT); 1125 (MTE_DEPTH_16 << MTE_DEPTH_SHIFT);
1126 sc->sc_mte_x_shift = 1; 1126 sc->sc_mte_x_shift = 1;
1127 break; 1127 break;
1128 case 32: 1128 case 32:
1129 sc->sc_de_mode = DE_MODE_TLB_A | DE_MODE_BUFDEPTH_32 | 1129 sc->sc_de_mode = DE_MODE_TLB_A | DE_MODE_BUFDEPTH_32 |
1130 DE_MODE_TYPE_RGBA | DE_MODE_PIXDEPTH_32; 1130 DE_MODE_TYPE_RGBA | DE_MODE_PIXDEPTH_32;
1131 break; 
1132 sc->sc_mte_mode = MTE_MODE_DST_ECC | 1131 sc->sc_mte_mode = MTE_MODE_DST_ECC |
1133 (MTE_TLB_A << MTE_DST_TLB_SHIFT) | 1132 (MTE_TLB_A << MTE_DST_TLB_SHIFT) |
1134 (MTE_TLB_A << MTE_SRC_TLB_SHIFT) | 1133 (MTE_TLB_A << MTE_SRC_TLB_SHIFT) |
1135 (MTE_DEPTH_32 << MTE_DEPTH_SHIFT); 1134 (MTE_DEPTH_32 << MTE_DEPTH_SHIFT);
1136 sc->sc_mte_x_shift = 2; 1135 sc->sc_mte_x_shift = 2;
1137 break; 1136 break;
1138 default: 1137 default:
1139 panic("%s: unsuported colour depth %d\n", __func__, 1138 panic("%s: unsuported colour depth %d\n", __func__,
1140 depth); 1139 depth);
1141 } 1140 }
1142 sc->sc_needs_sync = 0; 1141 sc->sc_needs_sync = 0;
1143 sc->sc_src_mode = 0xffffffff; 1142 sc->sc_src_mode = 0xffffffff;
1144 sc->sc_dst_mode = 0xffffffff; 1143 sc->sc_dst_mode = 0xffffffff;