Fri Jan 31 15:41:48 2014 UTC ()
Remove unnecessary #if 1/#endif.


(tsutsui)
diff -r1.12 -r1.13 src/sys/arch/ews4800mips/sbd/fb_sbdio.c
cvs diff -r1.12 -r1.13 src/sys/arch/ews4800mips/sbd/fb_sbdio.c (expand / switch to unified diff)

--- src/sys/arch/ews4800mips/sbd/fb_sbdio.c 2012/01/11 21:17:33 1.12
+++ src/sys/arch/ews4800mips/sbd/fb_sbdio.c 2014/01/31 15:41:48 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: fb_sbdio.c,v 1.12 2012/01/11 21:17:33 macallan Exp $ */ 1/* $NetBSD: fb_sbdio.c,v 1.13 2014/01/31 15:41:48 tsutsui Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc. 4 * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by UCHIYAMA Yasushi. 8 * by UCHIYAMA Yasushi.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -22,27 +22,27 @@ @@ -22,27 +22,27 @@
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#define WIRED_FB_TLB 32#define WIRED_FB_TLB
33 33
34#include <sys/cdefs.h> 34#include <sys/cdefs.h>
35__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.12 2012/01/11 21:17:33 macallan Exp $"); 35__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.13 2014/01/31 15:41:48 tsutsui 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/malloc.h> 39#include <sys/malloc.h>
40#include <dev/cons.h> 40#include <dev/cons.h>
41 41
42#include <uvm/uvm_extern.h> /* pmap function to remap FB */ 42#include <uvm/uvm_extern.h> /* pmap function to remap FB */
43 43
44#include <dev/wscons/wsconsio.h> 44#include <dev/wscons/wsconsio.h>
45#include <dev/wscons/wsdisplayvar.h> 45#include <dev/wscons/wsdisplayvar.h>
46#include <dev/wsfont/wsfont.h> 46#include <dev/wsfont/wsfont.h>
47#include <dev/rasops/rasops.h> 47#include <dev/rasops/rasops.h>
48 48
@@ -284,32 +284,30 @@ _fb_ioctl(void *v, void *vs, u_long cmd, @@ -284,32 +284,30 @@ _fb_ioctl(void *v, void *vs, u_long cmd,
284 284
285 switch (cmd) { 285 switch (cmd) {
286 case WSDISPLAYIO_GTYPE: 286 case WSDISPLAYIO_GTYPE:
287 *(uint32_t *)data = WSDISPLAY_TYPE_UNKNOWN; 287 *(uint32_t *)data = WSDISPLAY_TYPE_UNKNOWN;
288 return 0; 288 return 0;
289 289
290 case WSDISPLAYIO_GINFO: 290 case WSDISPLAYIO_GINFO:
291 fbinfo->height = ri->ri_height; 291 fbinfo->height = ri->ri_height;
292 fbinfo->width = ri->ri_width; 292 fbinfo->width = ri->ri_width;
293 fbinfo->depth = ri->ri_depth; 293 fbinfo->depth = ri->ri_depth;
294 fbinfo->cmsize = 256; 294 fbinfo->cmsize = 256;
295 return 0; 295 return 0;
296 296
297#if 1 
298 case WSDISPLAYIO_LINEBYTES: 297 case WSDISPLAYIO_LINEBYTES:
299 *(u_int *)data = ri->ri_stride; 298 *(u_int *)data = ri->ri_stride;
300 return 0; 299 return 0;
301 300
302#endif 
303 case WSDISPLAYIO_GETCMAP: 301 case WSDISPLAYIO_GETCMAP:
304 if (ri->ri_flg == RI_FORCEMONO) 302 if (ri->ri_flg == RI_FORCEMONO)
305 break; 303 break;
306 ga_clut_get(ga); 304 ga_clut_get(ga);
307 for (i = 0; i < cmap->count; i++) { 305 for (i = 0; i < cmap->count; i++) {
308 cmap->red[i] = ga->clut[cmap->index + i][0]; 306 cmap->red[i] = ga->clut[cmap->index + i][0];
309 cmap->green[i] = ga->clut[cmap->index + i][1]; 307 cmap->green[i] = ga->clut[cmap->index + i][1];
310 cmap->blue[i] = ga->clut[cmap->index + i][2]; 308 cmap->blue[i] = ga->clut[cmap->index + i][2];
311 } 309 }
312 return 0; 310 return 0;
313 311
314 case WSDISPLAYIO_PUTCMAP: 312 case WSDISPLAYIO_PUTCMAP:
315 if (ri->ri_flg == RI_FORCEMONO) 313 if (ri->ri_flg == RI_FORCEMONO)