CVS commit: src/sbin/wsconsctl

2021-12-25 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Dec 25 13:54:13 UTC 2021

Modified Files:
src/sbin/wsconsctl: Makefile display.c util.c wsconsctl.h

Log Message:
Add support for a read-only edid attribute that shows the result of
WSDISPLAYIO_GET_EDID.

Uses code from sys/dev/videomode to parse and print the edid data.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sbin/wsconsctl/Makefile \
src/sbin/wsconsctl/display.c
cvs rdiff -u -r1.32 -r1.33 src/sbin/wsconsctl/util.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/wsconsctl/wsconsctl.h

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

Modified files:

Index: src/sbin/wsconsctl/Makefile
diff -u src/sbin/wsconsctl/Makefile:1.16 src/sbin/wsconsctl/Makefile:1.17
--- src/sbin/wsconsctl/Makefile:1.16	Tue Oct 26 17:33:18 2021
+++ src/sbin/wsconsctl/Makefile	Sat Dec 25 13:54:13 2021
@@ -1,17 +1,19 @@
-#	$NetBSD: Makefile,v 1.16 2021/10/26 17:33:18 rillig Exp $
+#	$NetBSD: Makefile,v 1.17 2021/12/25 13:54:13 mlelstv Exp $
 
 PROG=	wsconsctl
 SRCS=	display.c keyboard.c keysym.c map_parse.y map_scan.l \
-		mouse.c util.c wsconsctl.c
+		mouse.c util.c wsconsctl.c edid.c vesagtf.o videomode.o
 MAN=	wsconsctl.8
 
 YHEADER=	1
-CPPFLAGS+=	-I. -I${.CURDIR}
+CPPFLAGS+=	-I. -I${.CURDIR} -I${NETBSDSRCDIR}/sys
 DPSRCS+=	keysym.h
 CLEANFILES+=	keysym.h
 
 .include 
 
+.PATH: ${NETBSDSRCDIR}/sys/dev/videomode
+
 # Environment for scripts executed during build.
 SCRIPT_ENV= \
 	AWK=${TOOL_AWK:Q} \
Index: src/sbin/wsconsctl/display.c
diff -u src/sbin/wsconsctl/display.c:1.16 src/sbin/wsconsctl/display.c:1.17
--- src/sbin/wsconsctl/display.c:1.16	Tue Mar 20 18:50:31 2012
+++ src/sbin/wsconsctl/display.c	Sat Dec 25 13:54:13 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: display.c,v 1.16 2012/03/20 18:50:31 matt Exp $ */
+/*	$NetBSD: display.c,v 1.17 2021/12/25 13:54:13 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -49,6 +49,8 @@ static struct wsdisplay_param backlight;
 static struct wsdisplay_param brightness;
 static struct wsdisplay_param contrast;
 static struct wsdisplay_scroll_data scroll_l;
+static struct wsdisplayio_edid_info edid_info;
+static uint8_t edid_buf[256];
 static int msg_default_attrs, msg_default_bg, msg_default_fg;
 static int msg_kernel_attrs, msg_kernel_bg, msg_kernel_fg;
 static int splash_enable, splash_progress;
@@ -62,6 +64,7 @@ struct field display_field_tab[] = {
 { "contrast",		&contrast.curval,   FMT_UINT,	FLG_MODIFY },
 { "scroll.fastlines",	&scroll_l.fastlines, FMT_UINT,	FLG_MODIFY },
 { "scroll.slowlines",	&scroll_l.slowlines, FMT_UINT,	FLG_MODIFY },
+{ "edid",			&edid_info, FMT_EDID,		FLG_RDONLY|FLG_NOAUTO },
 { "msg.default.attrs",	&msg_default_attrs, FMT_ATTRS,	0 },
 { "msg.default.bg",		&msg_default_bg, FMT_COLOR,	0 },
 { "msg.default.fg",		&msg_default_fg, FMT_COLOR,	0 },
@@ -144,6 +147,14 @@ display_get_values(int fd)
 			field_disable_by_value(&scroll_l.slowlines);
 		}
 	}
+
+	if (field_by_value(&edid_info)->flags & FLG_GET) {
+		edid_info.edid_data = edid_buf;
+		edid_info.buffer_size = sizeof(edid_buf);
+		if (ioctl(fd, WSDISPLAYIO_GET_EDID, &edid_info) < 0) {
+			field_disable_by_value(&edid_info);
+		}
+	}
 }
 
 void

Index: src/sbin/wsconsctl/util.c
diff -u src/sbin/wsconsctl/util.c:1.32 src/sbin/wsconsctl/util.c:1.33
--- src/sbin/wsconsctl/util.c:1.32	Fri Nov 23 06:31:57 2018
+++ src/sbin/wsconsctl/util.c	Sat Dec 25 13:54:13 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.32 2018/11/23 06:31:57 mlelstv Exp $ */
+/*	$NetBSD: util.c,v 1.33 2021/12/25 13:54:13 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 1998, 2006, 2012 The NetBSD Foundation, Inc.
@@ -33,6 +33,9 @@
 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -249,6 +252,8 @@ pr_field(struct field *f, const char *se
 	const char *p;
 	unsigned int flags;
 	int first, i, mask;
+	struct wsdisplayio_edid_info *info;
+	struct edid_info edid;
 
 	if (sep)
 		(void)printf("%s%s", f->name, sep);
@@ -318,6 +323,15 @@ pr_field(struct field *f, const char *se
 		if (first)
 			(void)printf("none");
 		break;
+	case FMT_EDID:
+		info = (struct wsdisplayio_edid_info *)f->valp;
+		if (edid_parse(info->edid_data, &edid))
+			(void)printf("invalid");
+		else {
+			(void)printf("\n");
+			edid_print(&edid);
+		}
+		break;
 	default:
 		errx(EXIT_FAILURE, "internal error: pr_field: no format %d",
 		f->format);
@@ -512,3 +526,4 @@ print_kmap(struct wskbd_map_data *map)
 		}
 	}
 }
+

Index: src/sbin/wsconsctl/wsconsctl.h
diff -u src/sbin/wsconsctl/wsconsctl.h:1.13 src/sbin/wsconsctl/wsconsctl.h:1.14
--- src/sbin/wsconsctl/wsconsctl.h:1.13	Fri Nov 23 06:31:57 2018
+++ src/sbin/wsconsctl/wsconsctl.h	Sat Dec 25 13:54:13 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: wsconsctl.h,v 1.13 2018/11/23 06:31:57 mlelstv Exp $ */
+/*	$NetBSD: wsconsctl.h,v 1.14 2021/12/25 13:54:13 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 1998, 2004, 2012

CVS commit: src/sbin/wsconsctl

2021-12-25 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Dec 25 13:54:13 UTC 2021

Modified Files:
src/sbin/wsconsctl: Makefile display.c util.c wsconsctl.h

Log Message:
Add support for a read-only edid attribute that shows the result of
WSDISPLAYIO_GET_EDID.

Uses code from sys/dev/videomode to parse and print the edid data.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sbin/wsconsctl/Makefile \
src/sbin/wsconsctl/display.c
cvs rdiff -u -r1.32 -r1.33 src/sbin/wsconsctl/util.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/wsconsctl/wsconsctl.h

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



Re: CVS commit: src/sbin/wsconsctl

2021-10-26 Thread Rin Okuyama

Thanks for the quick response!

rin

On 2021/10/27 2:35, Roland Illig wrote:

Am 26.10.2021 um 06:13 schrieb matthew green:

Rin Okuyama writes:

I don't think this is right thing to be committed.


i agree.


Thank you for the explanation, I just reverted the commit, resulting in
sbin/wsconsctl/Makefile 1.16.

Roland



Re: CVS commit: src/sbin/wsconsctl

2021-10-26 Thread Roland Illig
Am 26.10.2021 um 06:13 schrieb matthew green:
> Rin Okuyama writes:
>> I don't think this is right thing to be committed.
>
> i agree.

Thank you for the explanation, I just reverted the commit, resulting in
sbin/wsconsctl/Makefile 1.16.

Roland


CVS commit: src/sbin/wsconsctl

2021-10-26 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue Oct 26 17:33:18 UTC 2021

Modified Files:
src/sbin/wsconsctl: Makefile

Log Message:
wsconsctl: revert adding LINTFLAGS

https://mail-index.netbsd.org/source-changes-d/2021/10/26/msg013482.html
https://mail-index.netbsd.org/source-changes-d/2021/10/26/msg013483.html


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sbin/wsconsctl/Makefile

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

Modified files:

Index: src/sbin/wsconsctl/Makefile
diff -u src/sbin/wsconsctl/Makefile:1.15 src/sbin/wsconsctl/Makefile:1.16
--- src/sbin/wsconsctl/Makefile:1.15	Mon Oct 11 13:27:47 2021
+++ src/sbin/wsconsctl/Makefile	Tue Oct 26 17:33:18 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2021/10/11 13:27:47 rillig Exp $
+#	$NetBSD: Makefile,v 1.16 2021/10/26 17:33:18 rillig Exp $
 
 PROG=	wsconsctl
 SRCS=	display.c keyboard.c keysym.c map_parse.y map_scan.l \
@@ -9,7 +9,6 @@ YHEADER=	1
 CPPFLAGS+=	-I. -I${.CURDIR}
 DPSRCS+=	keysym.h
 CLEANFILES+=	keysym.h
-LINTFLAGS+=	-I${NETBSDSRCDIR}/sys
 
 .include 
 



CVS commit: src/sbin/wsconsctl

2021-10-26 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue Oct 26 17:33:18 UTC 2021

Modified Files:
src/sbin/wsconsctl: Makefile

Log Message:
wsconsctl: revert adding LINTFLAGS

https://mail-index.netbsd.org/source-changes-d/2021/10/26/msg013482.html
https://mail-index.netbsd.org/source-changes-d/2021/10/26/msg013483.html


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sbin/wsconsctl/Makefile

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



re: CVS commit: src/sbin/wsconsctl

2021-10-25 Thread matthew green
Rin Okuyama writes:
> I don't think this is right thing to be committed.

i agree.

> By this way, we can add similar LINTFLAGS hacks every when
> kernel API is changed.
>
> Please keep this kinds of hacks within your local repository.
>
> > Running lint in non-tools mode picked up the header from the installed
> > system, not the one corresponding to the source code. The installed
> > header on NetBSD 9.99.88 does not define WSMOUSECFG_MAX yet.

i would go far to say that the above behaviour is 100%
_expected_.  if you're building in non tools mode then you
are using the installed system, and not using it would be
not how this has always worked.  this is why, whether you're
using build.sh or not, "make includes" early is a necessary
pre-condition for building.

> Thanks,
> rin


.mrg.

> On 2021/10/11 22:27, Roland Illig wrote:
> > Module Name:src
> > Committed By:   rillig
> > Date:   Mon Oct 11 13:27:47 UTC 2021
> > 
> > Modified Files:
> > src/sbin/wsconsctl: Makefile
> > 
> > Log Message:
> > wsconsctl: include correct header for lint
> > 
> > Running lint in non-tools mode picked up the header from the installed
> > system, not the one corresponding to the source code. The installed
> > header on NetBSD 9.99.88 does not define WSMOUSECFG_MAX yet.


Re: CVS commit: src/sbin/wsconsctl

2021-10-25 Thread Rin Okuyama

I don't think this is right thing to be committed.

By this way, we can add similar LINTFLAGS hacks every when
kernel API is changed.

Please keep this kinds of hacks within your local repository.

Thanks,
rin

On 2021/10/11 22:27, Roland Illig wrote:

Module Name:src
Committed By:   rillig
Date:   Mon Oct 11 13:27:47 UTC 2021

Modified Files:
src/sbin/wsconsctl: Makefile

Log Message:
wsconsctl: include correct header for lint

Running lint in non-tools mode picked up the header from the installed
system, not the one corresponding to the source code. The installed
header on NetBSD 9.99.88 does not define WSMOUSECFG_MAX yet.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sbin/wsconsctl/Makefile

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


CVS commit: src/sbin/wsconsctl

2021-10-11 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Mon Oct 11 13:27:47 UTC 2021

Modified Files:
src/sbin/wsconsctl: Makefile

Log Message:
wsconsctl: include correct header for lint

Running lint in non-tools mode picked up the header from the installed
system, not the one corresponding to the source code. The installed
header on NetBSD 9.99.88 does not define WSMOUSECFG_MAX yet.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sbin/wsconsctl/Makefile

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

Modified files:

Index: src/sbin/wsconsctl/Makefile
diff -u src/sbin/wsconsctl/Makefile:1.14 src/sbin/wsconsctl/Makefile:1.15
--- src/sbin/wsconsctl/Makefile:1.14	Sun Oct 26 14:55:17 2008
+++ src/sbin/wsconsctl/Makefile	Mon Oct 11 13:27:47 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2008/10/26 14:55:17 apb Exp $
+#	$NetBSD: Makefile,v 1.15 2021/10/11 13:27:47 rillig Exp $
 
 PROG=	wsconsctl
 SRCS=	display.c keyboard.c keysym.c map_parse.y map_scan.l \
@@ -9,6 +9,7 @@ YHEADER=	1
 CPPFLAGS+=	-I. -I${.CURDIR}
 DPSRCS+=	keysym.h
 CLEANFILES+=	keysym.h
+LINTFLAGS+=	-I${NETBSDSRCDIR}/sys
 
 .include 
 



CVS commit: src/sbin/wsconsctl

2021-10-11 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Mon Oct 11 13:27:47 UTC 2021

Modified Files:
src/sbin/wsconsctl: Makefile

Log Message:
wsconsctl: include correct header for lint

Running lint in non-tools mode picked up the header from the installed
system, not the one corresponding to the source code. The installed
header on NetBSD 9.99.88 does not define WSMOUSECFG_MAX yet.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sbin/wsconsctl/Makefile

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



CVS commit: src/sbin/wsconsctl

2021-09-27 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Tue Sep 28 06:20:09 UTC 2021

Modified Files:
src/sbin/wsconsctl: mouse.c

Log Message:
wsconsctl: allow the new "precision scrolling" variables to be configured


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sbin/wsconsctl/mouse.c

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

Modified files:

Index: src/sbin/wsconsctl/mouse.c
diff -u src/sbin/wsconsctl/mouse.c:1.10 src/sbin/wsconsctl/mouse.c:1.11
--- src/sbin/wsconsctl/mouse.c:1.10	Mon Dec 24 01:29:20 2012
+++ src/sbin/wsconsctl/mouse.c	Tue Sep 28 06:20:09 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mouse.c,v 1.10 2012/12/24 01:29:20 khorben Exp $ */
+/*	$NetBSD: mouse.c,v 1.11 2021/09/28 06:20:09 nia Exp $ */
 
 /*-
  * Copyright (c) 1998, 2006, 2012 The NetBSD Foundation, Inc.
@@ -42,6 +42,9 @@
 
 #include "wsconsctl.h"
 
+static int reverse_scrolling;
+static int horiz_scroll_dist;
+static int vert_scroll_dist;
 static int mstype;
 static int resolution;
 static int samplerate;
@@ -49,6 +52,9 @@ static struct wsmouse_calibcoords calibr
 static char *calibration_samples;
 static struct wsmouse_repeat repeat;
 
+static void mouse_get_parameters(int);
+static void mouse_put_parameters(int);
+
 static void mouse_get_calibration(int);
 static void mouse_put_calibration(int);
 
@@ -56,27 +62,30 @@ static void mouse_get_repeat(int);
 static void mouse_put_repeat(int);
 
 struct field mouse_field_tab[] = {
-{ "resolution",		&resolution,	FMT_UINT,	FLG_WRONLY },
-{ "samplerate",		&samplerate,	FMT_UINT,	FLG_WRONLY },
-{ "type",			&mstype,	FMT_MSTYPE,	FLG_RDONLY },
+{ "resolution",		&resolution,		FMT_UINT,	FLG_WRONLY },
+{ "samplerate",		&samplerate,		FMT_UINT,	FLG_WRONLY },
+{ "type",			&mstype,		FMT_MSTYPE,	FLG_RDONLY },
+{ "scroll.reverse",		&reverse_scrolling,	FMT_INT,	FLG_MODIFY },
+{ "scroll.distance.x",	&horiz_scroll_dist,	FMT_INT,	FLG_MODIFY },
+{ "scroll.distance.y",	&vert_scroll_dist,	FMT_INT,	FLG_MODIFY },
 { "calibration.minx",	&calibration.minx,
-		FMT_INT,	FLG_MODIFY },
+FMT_INT,	FLG_MODIFY },
 { "calibration.miny",	&calibration.miny,
-		FMT_INT,	FLG_MODIFY },
+			FMT_INT,	FLG_MODIFY },
 { "calibration.maxx",	&calibration.maxx,
-		FMT_INT,	FLG_MODIFY },
+			FMT_INT,	FLG_MODIFY },
 { "calibration.maxy",	&calibration.maxy,
-		FMT_INT,	FLG_MODIFY },
+			FMT_INT,	FLG_MODIFY },
 { "calibration.samples",	&calibration_samples,
-		FMT_STRING,	FLG_MODIFY },
+			FMT_STRING,	FLG_MODIFY },
 { "repeat.buttons",		&repeat.wr_buttons,
-		FMT_BITFIELD, FLG_MODIFY },
+			FMT_BITFIELD, FLG_MODIFY },
 { "repeat.delay.first",	&repeat.wr_delay_first,
-		FMT_UINT, FLG_MODIFY },
+			FMT_UINT, FLG_MODIFY },
 { "repeat.delay.decrement",	&repeat.wr_delay_decrement,
-		FMT_UINT, FLG_MODIFY },
+			FMT_UINT, FLG_MODIFY },
 { "repeat.delay.minimum",	&repeat.wr_delay_minimum,
- 		   FMT_UINT, FLG_MODIFY },
+ 		   	FMT_UINT, FLG_MODIFY },
 };
 
 int mouse_field_tab_len = sizeof(mouse_field_tab)/
@@ -102,6 +111,53 @@ mouse_get_values(int fd)
 	field_by_value(&repeat.wr_delay_decrement)->flags & FLG_GET ||
 	field_by_value(&repeat.wr_delay_minimum)->flags & FLG_GET)
 		mouse_get_repeat(fd);
+
+	if (field_by_value(&horiz_scroll_dist)->flags & FLG_GET ||
+	field_by_value(&vert_scroll_dist)->flags & FLG_GET ||
+	field_by_value(&reverse_scrolling)->flags & FLG_GET)
+		mouse_get_parameters(fd);
+}
+
+static void
+mouse_get_parameters(int fd)
+{
+	struct wsmouse_param params[WSMOUSECFG_MAX];
+	struct wsmouse_parameters pl;
+	unsigned int i;
+
+	pl.nparams = 0;
+	pl.params = params;
+
+	if (field_by_value(&reverse_scrolling)->flags & FLG_GET)
+		params[pl.nparams++].key = WSMOUSECFG_REVERSE_SCROLLING;
+	if (field_by_value(&horiz_scroll_dist)->flags & FLG_GET)
+		params[pl.nparams++].key = WSMOUSECFG_HORIZSCROLLDIST;
+	if (field_by_value(&vert_scroll_dist)->flags & FLG_GET)
+		params[pl.nparams++].key = WSMOUSECFG_VERTSCROLLDIST;
+
+	if (ioctl(fd, WSMOUSEIO_GETPARAMS, &pl) < 0) {
+		if (field_by_value(&horiz_scroll_dist)->flags & FLG_GET)
+			field_disable_by_value(&horiz_scroll_dist);
+		if (field_by_value(&vert_scroll_dist)->flags & FLG_GET)
+			field_disable_by_value(&vert_scroll_dist);
+		if (field_by_value(&reverse_scrolling)->flags & FLG_GET)
+			field_disable_by_value(&reverse_scrolling);
+		return;
+	}
+
+	for (i = 0; i < pl.nparams; ++i) {
+		switch (params[i].key) {
+		case WSMOUSECFG_REVERSE_SCROLLING:
+			reverse_scrolling = params[i].value;
+			break;
+		case WSMOUSECFG_HORIZSCROLLDIST:
+			horiz_scroll_dist = params[i].value;
+			break;
+		case WSMOUSECFG_VERTSCROLLDIST:
+			vert_scroll_dist = params[i].value;
+			break;
+		}
+	}
 }
 
 static void
@@ -205,6 +261,46 @@ mouse_put_values(int fd)
 	field_by_value(&r

CVS commit: src/sbin/wsconsctl

2021-09-27 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Tue Sep 28 06:20:09 UTC 2021

Modified Files:
src/sbin/wsconsctl: mouse.c

Log Message:
wsconsctl: allow the new "precision scrolling" variables to be configured


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sbin/wsconsctl/mouse.c

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



CVS commit: src/sbin/wsconsctl

2021-09-22 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Wed Sep 22 14:15:29 UTC 2021

Modified Files:
src/sbin/wsconsctl: keyboard.c

Log Message:
fail on error, not on success.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sbin/wsconsctl/keyboard.c

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

Modified files:

Index: src/sbin/wsconsctl/keyboard.c
diff -u src/sbin/wsconsctl/keyboard.c:1.11 src/sbin/wsconsctl/keyboard.c:1.12
--- src/sbin/wsconsctl/keyboard.c:1.11	Sun Sep 13 07:35:15 2020
+++ src/sbin/wsconsctl/keyboard.c	Wed Sep 22 14:15:29 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: keyboard.c,v 1.11 2020/09/13 07:35:15 mlelstv Exp $ */
+/*	$NetBSD: keyboard.c,v 1.12 2021/09/22 14:15:29 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -200,7 +200,7 @@ keyboard_put_values(int fd)
 {
 
 	if (field_by_value(&kbmode)->flags & FLG_SET) {
-		if (ioctl(fd, WSKBDIO_SETMODE, &kbmode) == 0)
+		if (ioctl(fd, WSKBDIO_SETMODE, &kbmode) < 0)
 			err(EXIT_FAILURE, "WSKBDIO_SETMODE");
 		pr_field(field_by_value(&kbmode), " -> ");
 	}



CVS commit: src/sbin/wsconsctl

2021-09-22 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Wed Sep 22 14:15:29 UTC 2021

Modified Files:
src/sbin/wsconsctl: keyboard.c

Log Message:
fail on error, not on success.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sbin/wsconsctl/keyboard.c

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



Re: CVS commit: src/sbin/wsconsctl

2011-02-07 Thread Izumi Tsutsui
martin@ wrote:

> On Mon, Feb 07, 2011 at 08:28:40AM +0900, Izumi Tsutsui wrote:
> > I changed them to sync with OpenBSD,
> > to avoid divergence in (possible) xf86-video-foo drivers.
> > (I didn't think they were ever referred from userland..)
> 
> I'm not sure the whole idea of a single MI enumeration of frame buffer types
> makes sense at all.

IMO, keyboard/display/mouse names in util.c should be returned
as a part of ioctl(2), but we have too many MI/MD drivers to
reorganize APIs.

We know wscons(4) APIs are really suck but
we also know we won't get a reasonable goal...
(I thought "WSDISPLAYIO_LINEBYTES" data should be in a WSDISPLAYIO_GINFO,
 but adding a new API was much easier than preparing compat ones.)
---
Izumi Tsutsui


Re: CVS commit: src/sbin/wsconsctl

2011-02-07 Thread Martin Husemann
On Mon, Feb 07, 2011 at 08:28:40AM +0900, Izumi Tsutsui wrote:
> I changed them to sync with OpenBSD,
> to avoid divergence in (possible) xf86-video-foo drivers.
> (I didn't think they were ever referred from userland..)

I'm not sure the whole idea of a single MI enumeration of frame buffer types
makes sense at all.

Martin


Re: CVS commit: src/sbin/wsconsctl

2011-02-06 Thread Izumi Tsutsui
> Modified Files:
>   src/sbin/wsconsctl: util.c
> 
> Log Message:
> update macro names to match new ones
> (i don't know why they changed, just fixing the build)

Thanks.

I changed them to sync with OpenBSD,
to avoid divergence in (possible) xf86-video-foo drivers.
(I didn't think they were ever referred from userland..)

---
Izumi Tsutsui


CVS commit: src/sbin/wsconsctl

2010-01-29 Thread Matthias Drochner
Module Name:src
Committed By:   drochner
Date:   Fri Jan 29 09:49:34 UTC 2010

Modified Files:
src/sbin/wsconsctl: keysym.c

Log Message:
follow KS_GROUP_Ascii->KS_GROUP_Plain rename in kernel,
noticed by Andreas Gustafsson


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sbin/wsconsctl/keysym.c

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