The NetBSD Project

CVS log for src/sys/dev/hid/hidkbdmap.c

[BACK] Up to [cvs.NetBSD.org] / src / sys / dev / hid

Request diff between arbitrary revisions


Keyword substitution: kv
Default branch: MAIN


Revision 1.15.10.2: download - view: text, markup, annotated - select for diffs
Wed Nov 4 23:21:53 2026 UTC (11 days, 6 hours ago) by perseant
Branches: perseant-exfatfs
Diff to: previous 1.15.10.1: preferred, colored; branchpoint 1.15: preferred, colored; next MAIN 1.16: preferred, colored
Changes since revision 1.15.10.1: +3 -4 lines
Sync with HEAD

Revision 1.17: download - view: text, markup, annotated - select for diffs
Sun Nov 1 17:09:51 2026 UTC (2 weeks ago) by jakllsch
Branches: MAIN
CVS tags: perseant-exfatfs-base-20261102, HEAD
Diff to: previous 1.16: preferred, colored
Changes since revision 1.16: +3 -4 lines
Correct mapping of KS_Power for the "Keyboard Power" Usage ID.

It's USB Keyboard/Keypad Page usage 102 (not 109 which is F18).

Revision 1.15.4.1: download - view: text, markup, annotated - select for diffs
Mon Oct 20 14:03:00 2025 UTC (12 months, 3 weeks ago) by martin
Branches: netbsd-10
CVS tags: netbsd-10-2-RELEASE
Diff to: previous 1.15: preferred, colored; next MAIN 1.16: preferred, colored
Changes since revision 1.15: +20 -2 lines
Pull up following revision(s) (requested by nia in ticket #1180):

	sys/dev/hid/hidkbdmap.c: revision 1.16
	sys/dev/pckbport/wskbdmap_mfii.c: revision 1.36

wskbd(4): Define USB and PS/2 keymaps for KB_PL

This is the de-facto standard "Polish programmers" QWERTY keyboard,
what X11 simply calls "Polish". It's a simple variation of US QWERTY
with some extra characters when right alt is pressed.

Defining this layout is slightly optimistic, since even with latin-2
fonts loaded and the appropriate locale set, wscons seems to struggle
to input most of these characters.

Regardless, this allows the supposedly supported "pl" encoding
to not fail loading with an error message, and allows X11 to
auto-detect the keyboard layout (defining KB_PL and as an alias of
KB_US also accomplishes this goal), with room for proper UTF-8
support in the future.

PR port-amd64/57234 "# wsconsctl -k -w encoding=pl" *should* work.
PR kern/57844 wscons doesn't support encoding=pl contrary to wskbd(4) man page
PR install/58405 Selecting Polish keyboard type in sysinst is useless

Revision 1.15.10.1: download - view: text, markup, annotated - select for diffs
Sat Aug 2 05:56:38 2025 UTC (15 months, 2 weeks ago) by perseant
Branches: perseant-exfatfs
Diff to: previous 1.15: preferred, colored
Changes since revision 1.15: +20 -2 lines
Sync with HEAD

Revision 1.16: download - view: text, markup, annotated - select for diffs
Sat May 24 16:50:54 2025 UTC (17 months, 3 weeks ago) by nia
Branches: MAIN
CVS tags: perseant-exfatfs-base-20250801, netbsd-11-base, netbsd-11-1-RELEASE, netbsd-11-0-RELEASE, netbsd-11-0-RC7, netbsd-11-0-RC6, netbsd-11-0-RC5, netbsd-11-0-RC4, netbsd-11-0-RC3, netbsd-11-0-RC2, netbsd-11-0-RC1, netbsd-11
Diff to: previous 1.15: preferred, colored
Changes since revision 1.15: +20 -2 lines
wskbd(4): Define USB and PS/2 keymaps for KB_PL

This is the de-facto standard "Polish programmers" QWERTY keyboard,
what X11 simply calls "Polish". It's a simple variation of US QWERTY
with some extra characters when right alt is pressed.

Defining this layout is slightly optimistic, since even with latin-2
fonts loaded and the appropriate locale set, wscons seems to struggle
to input most of these characters.

Regardless, this allows the supposedly supported "pl" encoding
to not fail loading with an error message, and allows X11 to
auto-detect the keyboard layout (defining KB_PL and as an alias of
KB_US also accomplishes this goal), with room for proper UTF-8
support in the future.

PR port-amd64/57234 "# wsconsctl -k -w encoding=pl" *should* work.
PR kern/57844 wscons doesn't support encoding=pl contrary to wskbd(4) man page
PR install/58405 Selecting Polish keyboard type in sysinst is useless

Revision 1.15: download - view: text, markup, annotated - select for diffs
Wed Sep 22 17:37:32 2021 UTC (5 years, 1 month ago) by nia
Branches: MAIN
CVS tags: thorpej-ifq-base, thorpej-ifq, thorpej-altq-separation-base, thorpej-altq-separation, perseant-exfatfs-base-20240630, perseant-exfatfs-base, netbsd-10-base, netbsd-10-1-RELEASE, netbsd-10-0-RELEASE, netbsd-10-0-RC6, netbsd-10-0-RC5, netbsd-10-0-RC4, netbsd-10-0-RC3, netbsd-10-0-RC2, netbsd-10-0-RC1, bouyer-sunxi-drm-base, bouyer-sunxi-drm
Branch point for: perseant-exfatfs, netbsd-10
Diff to: previous 1.14: preferred, colored
Changes since revision 1.14: +58 -3 lines
wscons: add definitions for BÉPO, a standardized, Dvorak-style optimized
keyboard layout for French

Revision 1.12.6.2: download - view: text, markup, annotated - select for diffs
Sun Aug 1 22:42:23 2021 UTC (5 years, 3 months ago) by thorpej
Branches: thorpej-i2c-spi-conf
Diff to: previous 1.12.6.1: preferred, colored; branchpoint 1.12: preferred, colored; next MAIN 1.13: preferred, colored
Changes since revision 1.12.6.1: +3 -2 lines
Sync with HEAD.

Revision 1.14: download - view: text, markup, annotated - select for diffs
Wed Jul 21 06:35:45 2021 UTC (5 years, 3 months ago) by skrll
Branches: MAIN
CVS tags: thorpej-i2c-spi-conf2-base, thorpej-i2c-spi-conf2, thorpej-i2c-spi-conf-base, thorpej-futex2-base, thorpej-futex2, thorpej-cfargs2-base, thorpej-cfargs2
Diff to: previous 1.13: preferred, colored
Changes since revision 1.13: +3 -2 lines
need <sys/param.h> for COHERENCY_UNIT

Minor KNF along the way.

Revision 1.12.8.1: download - view: text, markup, annotated - select for diffs
Mon May 31 22:15:17 2021 UTC (5 years, 5 months ago) by cjep
Branches: cjep_staticlib_x
Diff to: previous 1.12: preferred, colored; next MAIN 1.13: preferred, colored
Changes since revision 1.12: +57 -2 lines
sync with head

Revision 1.12.6.1: download - view: text, markup, annotated - select for diffs
Thu May 13 00:47:30 2021 UTC (5 years, 6 months ago) by thorpej
Branches: thorpej-i2c-spi-conf
Diff to: previous 1.12: preferred, colored
Changes since revision 1.12: +57 -2 lines
Sync with HEAD.

Revision 1.13: download - view: text, markup, annotated - select for diffs
Tue May 11 10:16:48 2021 UTC (5 years, 6 months ago) by nia
Branches: MAIN
CVS tags: cjep_sun2x-base1, cjep_sun2x-base, cjep_sun2x, cjep_staticlib_x-base1
Diff to: previous 1.12: preferred, colored
Changes since revision 1.12: +57 -2 lines
wscons: add support for the Neo 2 German keyboard layout

Neo is an optimized layout for German and English, similar to
Dvorak for English. It can be used to type most Latin-based languages
and has separate layers for symbols and directional commands.

Revision 1.1.10.3: download - view: text, markup, annotated - select for diffs
Sat Sep 19 12:16:14 2020 UTC (6 years, 1 month ago) by martin
Branches: netbsd-9
CVS tags: netbsd-9-5-RELEASE, netbsd-9-4-RELEASE, netbsd-9-3-RELEASE, netbsd-9-2-RELEASE, netbsd-9-1-RELEASE
Diff to: previous 1.1.10.2: preferred, colored; branchpoint 1.1: preferred, colored; next MAIN 1.2: preferred, colored
Changes since revision 1.1.10.2: +4 -3 lines
Pull up following revision(s) (requested by nonaka in ticket #1086):

	sys/dev/hid/hidkbdmap.c: revision 1.11

for jp keymap map also scan code 49 to right bracket to handle ARCHISS model
PR kern/55608 by Shinichi Doyashiki

Revision 1.12: download - view: text, markup, annotated - select for diffs
Sat Aug 29 22:42:53 2020 UTC (6 years, 2 months ago) by macallan
Branches: MAIN
CVS tags: thorpej-futex-base, thorpej-futex, thorpej-cfargs-base, thorpej-cfargs, cjep_staticlib_x-base
Branch point for: thorpej-i2c-spi-conf, cjep_staticlib_x
Diff to: previous 1.11: preferred, colored
Changes since revision 1.11: +11 -2 lines
provide KB_APPLE layout variant which uses Command-F* to switch console screens
mostly for consistent behaviour across *Books which may have ADB or USB
keyboards

Revision 1.11: download - view: text, markup, annotated - select for diffs
Wed Aug 26 10:34:03 2020 UTC (6 years, 2 months ago) by jdolecek
Branches: MAIN
Diff to: previous 1.10: preferred, colored
Changes since revision 1.10: +4 -3 lines
for jp keymap map also scan code 49 to right bracket to handle ARCHISS model

PR kern/55608 by Shinichi Doyashiki

Revision 1.1.10.2: download - view: text, markup, annotated - select for diffs
Mon Jul 13 14:22:47 2020 UTC (6 years, 4 months ago) by martin
Branches: netbsd-9
Diff to: previous 1.1.10.1: preferred, colored; branchpoint 1.1: preferred, colored
Changes since revision 1.1.10.1: +195 -2 lines
Pull up following revision(s) (requested by nia in ticket #1002):

	sys/dev/wscons/wsksymdef.h: revision 1.68
	sys/dev/wscons/wsksymdef.h: revision 1.69
	sys/dev/pckbport/wskbdmap_mfii.c: revision 1.28
	sys/dev/pckbport/wskbdmap_mfii.c: revision 1.29
	sys/dev/hid/hidkbdmap.c: revision 1.10
	share/man/man4/pckbd.4: revision 1.23
	share/man/man4/wskbd.4: revision 1.18
	share/man/man4/wskbd.4: revision 1.19
	share/man/man4/pckbd.4: revision 1.25
	sys/dev/wscons/wsksymdef.h: revision 1.70
	sys/dev/wscons/wsksymdef.h: revision 1.71
	sys/dev/pckbport/wskbdmap_mfii.c: revision 1.30
	sys/dev/wscons/wsksymdef.h: revision 1.72
	sys/dev/pckbport/wskbdmap_mfii.c: revision 1.31
	sys/dev/wscons/wsksymdef.h: revision 1.73
	sys/dev/pckbport/wskbdmap_mfii.c: revision 1.32
	sys/dev/pckbport/wskbdmap_mfii.c: revision 1.33
	sys/dev/hid/hidkbdmap.c: revision 1.4
	sbin/wsconsctl/wsconsctl.8: revision 1.30
	sys/dev/hid/hidkbdmap.c: revision 1.5
	etc/wscons.conf: revision 1.20
	sys/dev/hid/hidkbdmap.c: revision 1.6
	etc/wscons.conf: revision 1.21
	sys/dev/hid/hidkbdmap.c: revision 1.7
	sys/dev/hid/hidkbdmap.c: revision 1.8
	sys/dev/hid/hidkbdmap.c: revision 1.9

Add support for the Brazilian keyboard layout to pckbd and ukbd.

This is significantly different from the European Portugese layout,
and was pieced together from Wikipedia, X11 layout files, and to
some extent with trial and error.

Thanks to lun-4 for helping test this.

PR kern/44570
Update lists of keyboard layouts to add Turkish and Brazilian

Bring br.nodead closer to X11

Add Estonian layout as a variation of Swedish for ukbd and pckbd

Add KB_TR for uhid keyboards (it was PS/2 only, this seems wrong)

Add Icelandic keyboard layout to ukbd/pckbd.

Add keyboard layout for Latin American Spanish to ukbd/pckbd

Canadian French keyboard layout for ukbd/pckbd

Clarify that KB_TR is the "Q" layout - there's two standards for Turkish.

Move description of keyboard layouts to wskbd.4, add newer layouts

Previously, the best reference was pckbd.4. This does not make much
sense to read if you are on, say, an evbarm device with only USB.
wsconsctl.8 contained a vaguer description of supported language names,
which isn't very useful because you can't pass full language names
to the command. Point readers to wskbd.4 instead.

Note in the wskbd.4 page that while all layouts are generally supported
by pckbd(4) and ukbd(4), older keyboard interfaces might only support
a subset.

wskbd.4: Add KB_LA

Point readers at wskbd.4

Revision 1.10: download - view: text, markup, annotated - select for diffs
Mon Jul 13 09:44:48 2020 UTC (6 years, 4 months ago) by nia
Branches: MAIN
Diff to: previous 1.9: preferred, colored
Changes since revision 1.9: +35 -2 lines
Canadian French keyboard layout for ukbd/pckbd

Revision 1.9: download - view: text, markup, annotated - select for diffs
Mon Jul 13 08:45:12 2020 UTC (6 years, 4 months ago) by nia
Branches: MAIN
Diff to: previous 1.8: preferred, colored
Changes since revision 1.8: +30 -2 lines
Add keyboard layout for Latin American Spanish to ukbd/pckbd

Revision 1.8: download - view: text, markup, annotated - select for diffs
Sun Jul 12 14:31:49 2020 UTC (6 years, 4 months ago) by nia
Branches: MAIN
Diff to: previous 1.7: preferred, colored
Changes since revision 1.7: +40 -2 lines
Add Icelandic keyboard layout to ukbd/pckbd.

Revision 1.7: download - view: text, markup, annotated - select for diffs
Sun Jul 12 13:12:17 2020 UTC (6 years, 4 months ago) by nia
Branches: MAIN
Diff to: previous 1.6: preferred, colored
Changes since revision 1.6: +41 -2 lines
Add KB_TR for uhid keyboards (it was PS/2 only, this seems wrong)

Revision 1.6: download - view: text, markup, annotated - select for diffs
Sun Jul 12 12:13:05 2020 UTC (6 years, 4 months ago) by nia
Branches: MAIN
Diff to: previous 1.5: preferred, colored
Changes since revision 1.5: +20 -2 lines
Add Estonian layout as a variation of Swedish for ukbd and pckbd

Revision 1.5: download - view: text, markup, annotated - select for diffs
Sun Jul 12 01:44:24 2020 UTC (6 years, 4 months ago) by nia
Branches: MAIN
Diff to: previous 1.4: preferred, colored
Changes since revision 1.4: +3 -2 lines
Bring br.nodead closer to X11

Revision 1.4: download - view: text, markup, annotated - select for diffs
Sun Jul 12 01:35:59 2020 UTC (6 years, 4 months ago) by nia
Branches: MAIN
Diff to: previous 1.3: preferred, colored
Changes since revision 1.3: +38 -2 lines
Add support for the Brazilian keyboard layout to pckbd and ukbd.

This is significantly different from the European Portugese layout,
and was pieced together from Wikipedia, X11 layout files, and to
some extent with trial and error.

Thanks to lun-4 for helping test this.

PR kern/44570

Revision 1.2.4.1: download - view: text, markup, annotated - select for diffs
Sat Apr 25 11:23:59 2020 UTC (6 years, 6 months ago) by bouyer
Branches: bouyer-xenpvh
Diff to: previous 1.2: preferred, colored; next MAIN 1.3: preferred, colored
Changes since revision 1.2: +4 -4 lines
Sync with bouyer-xenpvh-base2 (HEAD)

Revision 1.3: download - view: text, markup, annotated - select for diffs
Fri Apr 24 13:29:46 2020 UTC (6 years, 6 months ago) by rhialto
Branches: MAIN
CVS tags: bouyer-xenpvh-base2
Diff to: previous 1.2: preferred, colored
Changes since revision 1.2: +4 -4 lines
For usb keyboards with encoding *.swapctrlcaps, keep KS_Cmd1 on the same
key as KS_Control_L. This brings them in line with wskbdmap_mfii.c.

Revision 1.1.4.1: download - view: text, markup, annotated - select for diffs
Wed Apr 8 14:08:05 2020 UTC (6 years, 7 months ago) by martin
Branches: phil-wifi
Diff to: previous 1.1: preferred, colored; next MAIN 1.2: preferred, colored
Changes since revision 1.1: +3 -2 lines
Merge changes from current as of 20200406

Revision 1.1.10.1: download - view: text, markup, annotated - select for diffs
Tue Jan 21 15:39:02 2020 UTC (6 years, 9 months ago) by martin
Branches: netbsd-9
CVS tags: netbsd-9-0-RELEASE, netbsd-9-0-RC2
Diff to: previous 1.1: preferred, colored
Changes since revision 1.1: +3 -2 lines
Pull up following revision(s) (requested by nia in ticket #635):

	sys/dev/pckbport/wskbdmap_mfii.c: revision 1.27
	share/man/man4/pckbd.4: revision 1.22
	sys/dev/hid/hidkbdmap.c: revision 1.2

Support the combination of KB_SWAPCTRLCAPS and UK layout.
Note some more layouts that work with KB_SWAPCTRLCAPS.

Revision 1.1.12.1: download - view: text, markup, annotated - select for diffs
Fri Jan 17 21:47:31 2020 UTC (6 years, 10 months ago) by ad
Branches: ad-namecache
Diff to: previous 1.1: preferred, colored; next MAIN 1.2: preferred, colored
Changes since revision 1.1: +3 -2 lines
Sync with head.

Revision 1.2: download - view: text, markup, annotated - select for diffs
Sat Jan 11 21:43:10 2020 UTC (6 years, 10 months ago) by nia
Branches: MAIN
CVS tags: phil-wifi-20200421, phil-wifi-20200411, phil-wifi-20200406, is-mlppp-base, is-mlppp, bouyer-xenpvh-base1, bouyer-xenpvh-base, ad-namecache-base3, ad-namecache-base2, ad-namecache-base1
Branch point for: bouyer-xenpvh
Diff to: previous 1.1: preferred, colored
Changes since revision 1.1: +3 -2 lines
Support the combination of KB_SWAPCTRLCAPS and UK layout.

Revision 1.1: download - view: text, markup, annotated - select for diffs
Sun Dec 10 17:03:07 2017 UTC (8 years, 11 months ago) by bouyer
Branches: MAIN
CVS tags: phil-wifi-base, phil-wifi-20191119, phil-wifi-20190609, pgoyette-compat-merge-20190127, pgoyette-compat-base, pgoyette-compat-20190127, pgoyette-compat-20190118, pgoyette-compat-1226, pgoyette-compat-1126, pgoyette-compat-1020, pgoyette-compat-0930, pgoyette-compat-0906, pgoyette-compat-0728, pgoyette-compat-0625, pgoyette-compat-0521, pgoyette-compat-0502, pgoyette-compat-0422, pgoyette-compat-0415, pgoyette-compat-0407, pgoyette-compat-0330, pgoyette-compat-0322, pgoyette-compat-0315, pgoyette-compat, netbsd-9-base, netbsd-9-0-RC1, jdolecek-ncqfixes-base, jdolecek-ncqfixes, isaki-audio2-base, isaki-audio2, ad-namecache-base
Branch point for: phil-wifi, netbsd-9, ad-namecache
Factor out bus-independant HID code so that it can be shared by USB, bluetooth
and i2c.
dev/usb/ukbdmap.c is renamed to dev/hid/hidkbdmap.c
dev/usb/hid.[ch] moved to dev/hid/
usage pages moved from dev/usb/usbhid.h moved to dev/hid/hid.h,
and updated with OpenBSD entries.
bus-independant code moved from dev/usb/ums.c to dev/hid/hidms.c
(the same should be done for keyboard and touchpad drivers)

Needed for the upcoming HID over I2C support, proposed on tech-kern@
on Dec, 1.

Diff request

This form allows you to request diffs between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Log view options

CVSweb <webmaster@jp.NetBSD.org>