Fix type of WSKBDIO_?ETENCODING in wsconsctl.

2012-07-13 Thread Alexandr Shadchin
From NetBSD

-- 
Alexandr Shadchin

Index: keyboard.c
===
RCS file: /cvs/src/sbin/wsconsctl/keyboard.c,v
retrieving revision 1.10
diff -u -p -r1.10 keyboard.c
--- keyboard.c  20 Aug 2010 00:20:55 -  1.10
+++ keyboard.c  13 Jul 2012 17:47:35 -
@@ -49,7 +49,7 @@ struct wskbd_map_data kbmap = { KS_NUMKE
 static struct wskbd_keyrepeat_data repeat;
 static struct wskbd_keyrepeat_data dfrepeat;
 static int ledstate;
-static int kbdencoding;
+static kbd_t kbdencoding;
 
 struct field keyboard_field_tab[] = {
 { type,  kbtype,FMT_KBDTYPE,FLG_RDONLY },



Re: Fix type of WSKBDIO_?ETENCODING in wsconsctl.

2012-07-13 Thread Alexandr Shadchin
more fix type

-- 
Alexandr Shadchin

Index: display.c
===
RCS file: /cvs/src/sbin/wsconsctl/display.c,v
retrieving revision 1.16
diff -u -p -r1.16 display.c
--- display.c   20 Aug 2010 00:20:55 -  1.16
+++ display.c   13 Jul 2012 22:09:02 -
@@ -40,7 +40,7 @@
 #include string.h
 #include wsconsctl.h
 
-int dpytype;
+u_int dpytype;
 u_int width, height, depth;
 int focus;
 struct field_pc brightness, contrast, backlight;
Index: keyboard.c
===
RCS file: /cvs/src/sbin/wsconsctl/keyboard.c,v
retrieving revision 1.10
diff -u -p -r1.10 keyboard.c
--- keyboard.c  20 Aug 2010 00:20:55 -  1.10
+++ keyboard.c  13 Jul 2012 22:09:02 -
@@ -40,7 +40,7 @@
 #include stdio.h
 #include wsconsctl.h
 
-static int kbtype;
+static u_int kbtype;
 static struct wskbd_bell_data bell;
 static struct wskbd_bell_data dfbell;
 static struct wscons_keymap mapdata[KS_NUMKEYCODES];
@@ -49,7 +49,7 @@ struct wskbd_map_data kbmap = { KS_NUMKE
 static struct wskbd_keyrepeat_data repeat;
 static struct wskbd_keyrepeat_data dfrepeat;
 static int ledstate;
-static int kbdencoding;
+static kbd_t kbdencoding;
 
 struct field keyboard_field_tab[] = {
 { type,  kbtype,FMT_KBDTYPE,FLG_RDONLY },
Index: mouse.c
===
RCS file: /cvs/src/sbin/wsconsctl/mouse.c,v
retrieving revision 1.11
diff -u -p -r1.11 mouse.c
--- mouse.c 20 Aug 2010 00:20:55 -  1.11
+++ mouse.c 13 Jul 2012 22:09:03 -
@@ -39,9 +39,9 @@
 #include stdio.h
 #include wsconsctl.h
 
-static int mstype;
-static int resolution;
-static int samplerate;
+static u_int mstype;
+static u_int resolution;
+static u_int samplerate;
 static int rawmode;
 
 struct wsmouse_calibcoords wmcoords, wmcoords_save;