Mon Jan 21 14:15:03 2013 UTC ()
add WSDISPLAY_TYPE_OMAP3


(macallan)
diff -r1.105 -r1.106 src/sys/dev/wscons/wsconsio.h

cvs diff -r1.105 -r1.106 src/sys/dev/wscons/wsconsio.h (expand / switch to unified diff)

--- src/sys/dev/wscons/wsconsio.h 2013/01/08 23:49:56 1.105
+++ src/sys/dev/wscons/wsconsio.h 2013/01/21 14:15:03 1.106
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: wsconsio.h,v 1.105 2013/01/08 23:49:56 jmcneill Exp $ */ 1/* $NetBSD: wsconsio.h,v 1.106 2013/01/21 14:15:03 macallan Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. 4 * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 3. All advertising materials mentioning features or use of this software 14 * 3. All advertising materials mentioning features or use of this software
@@ -320,26 +320,27 @@ struct wsmouse_repeat { @@ -320,26 +320,27 @@ struct wsmouse_repeat {
320#define WSDISPLAY_TYPE_LIGHT 44 /* SGI Light (a.k.a. Entry/Starter) */ 320#define WSDISPLAY_TYPE_LIGHT 44 /* SGI Light (a.k.a. Entry/Starter) */
321#define WSDISPLAY_TYPE_GENFB 45 /* generic nondescript framebuffer */ 321#define WSDISPLAY_TYPE_GENFB 45 /* generic nondescript framebuffer */
322#define WSDISPLAY_TYPE_CRIME 46 /* SGI O2 */ 322#define WSDISPLAY_TYPE_CRIME 46 /* SGI O2 */
323#define WSDISPLAY_TYPE_PXALCD 47 /* PXA2x0 LCD controller */ 323#define WSDISPLAY_TYPE_PXALCD 47 /* PXA2x0 LCD controller */
324#define WSDISPLAY_TYPE_AG10 48 /* Fujitsu AG-10e */ 324#define WSDISPLAY_TYPE_AG10 48 /* Fujitsu AG-10e */
325#define WSDISPLAY_TYPE_DL 49 /* DisplayLink DL-1x0/DL-1x5 */ 325#define WSDISPLAY_TYPE_DL 49 /* DisplayLink DL-1x0/DL-1x5 */
326#define WSDISPLAY_TYPE_XVR1000 50 /* Sun XVR-1000 */ 326#define WSDISPLAY_TYPE_XVR1000 50 /* Sun XVR-1000 */
327#define WSDISPLAY_TYPE_LUNA 51 /* OMRON SX-9100 LUNA */ 327#define WSDISPLAY_TYPE_LUNA 51 /* OMRON SX-9100 LUNA */
328#define WSDISPLAY_TYPE_GRF 52 /* wsdisplay on top of grf(4) */ 328#define WSDISPLAY_TYPE_GRF 52 /* wsdisplay on top of grf(4) */
329#define WSDISPLAY_TYPE_VNC 53 /* Usermode vnc framebuffer */ 329#define WSDISPLAY_TYPE_VNC 53 /* Usermode vnc framebuffer */
330#define WSDISPLAY_TYPE_VALKYRIE 54 /* Apple onboard video 'valkyrie' */ 330#define WSDISPLAY_TYPE_VALKYRIE 54 /* Apple onboard video 'valkyrie' */
331#define WSDISPLAY_TYPE_IMXIPU 55 /* i.MX ipu */ 331#define WSDISPLAY_TYPE_IMXIPU 55 /* i.MX ipu */
332#define WSDISPLAY_TYPE_VC4 56 /* Broadcom VideoCore 4 */ 332#define WSDISPLAY_TYPE_VC4 56 /* Broadcom VideoCore 4 */
 333#define WSDISPLAY_TYPE_OMAP3 57 /* OMAP 3530 */
333 334
334/* Basic display information. Not applicable to all display types. */ 335/* Basic display information. Not applicable to all display types. */
335struct wsdisplay_fbinfo { 336struct wsdisplay_fbinfo {
336 u_int height; /* height in pixels */ 337 u_int height; /* height in pixels */
337 u_int width; /* width in pixels */ 338 u_int width; /* width in pixels */
338 u_int depth; /* bits per pixel */ 339 u_int depth; /* bits per pixel */
339 u_int cmsize; /* color map size (entries) */ 340 u_int cmsize; /* color map size (entries) */
340}; 341};
341#define WSDISPLAYIO_GINFO _IOR('W', 65, struct wsdisplay_fbinfo) 342#define WSDISPLAYIO_GINFO _IOR('W', 65, struct wsdisplay_fbinfo)
342 343
343/* Colormap operations. Not applicable to all display types. */ 344/* Colormap operations. Not applicable to all display types. */
344struct wsdisplay_cmap { 345struct wsdisplay_cmap {
345 u_int index; /* first element (0 origin) */ 346 u_int index; /* first element (0 origin) */