Home | History | Annotate | Download | only in adb
History log of /src/sys/dev/adb/adb_kbd.c
RevisionDateAuthorComments
 1.36  16-Jun-2025  macallan move a couple more ADB macros into adbvar.h, drop <machine/keyboard.h>
 1.35  16-Jun-2025  macallan tsleep/wakeup -> cv_timedwait/cv_signal
while there remove a bunch of unnecessary includes
 1.34  11-Jun-2025  macallan make this actually self-contined
- don't include machine/adbsys.h - we only needed it for a couple #defines,
none of which are arch-specific
- move all the ADB definitions to adbvar.h
 1.33  14-May-2022  manu branches: 1.33.10;
Add ISO and JIS keyboard layouts for ADB to USB emulation

The layout is configurable using sysctl machdep.adbkbdX.emulate_usb:
0 = no emulation
1 = ANSI
2 = ISO (new with this change)
3 = JIS (new with this change)

Default value is detected using the ADB keyboard handler id. JIS
default is disabled until it is tested.
 1.32  07-Aug-2021  thorpej Merge thorpej-cfargs2.
 1.31  24-Apr-2021  thorpej branches: 1.31.8;
Merge thorpej-cfargs branch:

Simplify and make extensible the config_search() / config_found() /
config_attach() interfaces: rather than having different variants for
which arguments you want pass along, just have a single call that
takes a variadic list of tag-value arguments.

Adjust all call sites:
- Simplify wherever possible; don't pass along arguments that aren't
actually needed.
- Don't be explicit about what interface attribute is attaching if
the device only has one. (More simplification.)
- Add a config_probe() function to be used in indirect configuiration
situations, making is visibly easier to see when indirect config is
in play, and allowing for future change in semantics. (As of now,
this is just a wrapper around config_match(), but that is an
implementation detail.)

Remove unnecessary or redundant interface attributes where they're not
needed.

There are currently 5 "cfargs" defined:
- CFARG_SUBMATCH (submatch function for direct config)
- CFARG_SEARCH (search function for indirect config)
- CFARG_IATTR (interface attribte)
- CFARG_LOCATORS (locators array)
- CFARG_DEVHANDLE (devhandle_t - wraps OFW, ACPI, etc. handles)

...and a sentinel value CFARG_EOL.

Add some extra sanity checking to ensure that interface attributes
aren't ambiguous.

Use CFARG_DEVHANDLE in MI FDT, OFW, and ACPI code, and macppc and shark
ports to associate those device handles with device_t instance. This
will trickle trough to more places over time (need back-end for pre-OFW
Sun OBP; any others?).
 1.30  31-Aug-2020  macallan branches: 1.30.4;
defparam and use ADBKBD_LAYOUT, default to KB_US|KB_APPLE for tradition
 1.29  09-Jun-2019  christos make this compile again without ddb
 1.28  06-Jun-2019  macallan - call Debugger() from adbkbd_keys() instead of the task queue
- add options ADBKBD_POWER_DDB to enable DDB-on-Power by default
 1.27  28-Oct-2017  riastradh branches: 1.27.4;
Kill some more extern struct cfdriver declarations.

Down with externs in .c!
 1.26  29-Jul-2015  christos We don't have Debugger if we don't have DDB.
 1.25  27-Jul-2015  macallan add a sysctl to optionally ender ddb when pressing the power button
 1.24  08-Nov-2014  macallan branches: 1.24.2;
aprint_*-ize
 1.23  08-Nov-2014  macallan nicely ask the keyboard to distinguish between left and right Control, Alt
and Shift keys.
Welcome to the world of accents and diacritics!
 1.22  18-Nov-2013  nisimura branches: 1.22.4;

minor tweaks to shut gcc4.8 warning off.
 1.21  19-Sep-2012  macallan branches: 1.21.2;
some older powerbook keyboards use the same scancode for the power button as
later ones send on Fn-Command - now we look for that 'special' scancode only
on keyboards that actually need it
 1.20  02-Sep-2012  he branches: 1.20.2;
Move adbkbd_setup_sysctl() declaration to outside NWSMOUSE > 0, to
match the rest of the code.
 1.19  30-Aug-2012  macallan add options ADBKBD_EMUL_USB to turn USB emulation on by default
 1.18  29-Aug-2012  macallan when in event mode, optionally pretend to be a USB keyboard
with this USB and ADB keyboards can coexist at the same mux, with X just
listening to /dev/wskbd instead of having to open each one separately
this can be controlled via sysctl, defaults to off for now
needs testing with non-US keyboards
 1.17  02-Jun-2012  dsl Add some pre-processor magic to verify that the type of the data item
passed to sysctl_createv() actually matches the declared type for
the item itself.
In the places where the caller specifies a function and a structure
address (typically the 'softc') an explicit (void *) cast is now needed.
Fixes bugs in sys/dev/acpi/asus_acpi.c sys/dev/bluetooth/bcsp.c
sys/kern/vfs_bio.c sys/miscfs/syncfs/sync_subr.c and setting
AcpiGbl_EnableAmlDebugObject.
(mostly passing the address of a uint64_t when typed as CTLTYPE_INT).
I've test built quite a few kernels, but there may be some unfixed MD
fallout. Most likely passing &char[] to char *.
Also add CTLFLAG_UNSIGNED for unsiged decimals - not set yet.
 1.16  16-Nov-2011  macallan only require the power button to be pressed twice on keyboards where it's easy
to hit by accident, send an event to sysmon immediately otherwise
 1.15  18-Aug-2011  christos branches: 1.15.2;
Fix gcc-4.5 warnings. If you still see them, e-mail them to me.
 1.14  28-Jul-2011  macallan sanitize sysctl interface in order to appease gcc 4.5
 1.13  18-Mar-2009  cegger Ansify function definitions w/o arguments. Generated with sed.
 1.12  26-Mar-2008  matt branches: 1.12.4; 1.12.12; 1.12.18;
split softc/device_t
 1.11  10-Oct-2007  macallan branches: 1.11.18;
make this compile without wsmouse support in the kernel
 1.10  09-May-2007  macallan branches: 1.10.6; 1.10.8; 1.10.10;
in order to avoid accidential shutdown only send power button events to powerd
if the power button is pressed twice, with more than two but less than five
seconds delay
 1.9  16-Apr-2007  macallan don't panic when someone presses the power button without powerd running
 1.8  16-Apr-2007  macallan actually support WSDISPLAY_COMPAT_RAWKBD
unlike akbd we're sending ADB scancodes though, and don't try to translate
them into XT scancodes
 1.7  16-Apr-2007  macallan more autoconfig cosmetics
 1.6  16-Apr-2007  macallan on the iBook Fn-Command sends the same scancode as the power button on some
powerbooks so we'll listen to this scancode only on powerbooks
 1.5  04-Mar-2007  christos branches: 1.5.2; 1.5.4;
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
 1.4  20-Feb-2007  macallan branches: 1.4.2;
update copyrights
 1.3  20-Feb-2007  macallan report power button events to sysmon
 1.2  18-Jan-2007  macallan branches: 1.2.2; 1.2.4;
avoid another collision
 1.1  17-Jan-2007  macallan new, simplified ADB drivers
 1.2.4.4  17-May-2007  yamt sync with head.
 1.2.4.3  07-May-2007  yamt sync with head.
 1.2.4.2  12-Mar-2007  rmind Sync with HEAD.
 1.2.4.1  27-Feb-2007  yamt - sync with head.
- move sched_changepri back to kern_synch.c as it doesn't know PPQ anymore.
 1.2.2.2  06-Feb-2007  ad Fix CVS screwup.
 1.2.2.1  18-Jan-2007  ad file adb_kbd.c was added on branch newlock2 on 2007-02-06 17:10:30 +0000
 1.4.2.4  27-Oct-2007  yamt sync with head.
 1.4.2.3  03-Sep-2007  yamt sync with head.
 1.4.2.2  26-Feb-2007  yamt sync with head.
 1.4.2.1  20-Feb-2007  yamt file adb_kbd.c was added on branch yamt-lazymbuf on 2007-02-26 09:09:58 +0000
 1.5.4.1  11-Jul-2007  mjf Sync with head.
 1.5.2.2  12-Oct-2007  ad Sync with head.
 1.5.2.1  27-May-2007  ad Sync with head.
 1.10.10.1  14-Oct-2007  yamt sync with head.
 1.10.8.1  06-Nov-2007  matt sync with HEAD
 1.10.6.1  26-Oct-2007  joerg Sync with HEAD.

Follow the merge of pmap.c on i386 and amd64 and move
pmap_init_tmp_pgtbl into arch/x86/x86/pmap.c. Modify the ACPI wakeup
code to restore CR4 before jumping back into kernel space as the large
page option might cover that.
 1.11.18.1  03-Apr-2008  mjf Sync with HEAD.
 1.12.18.1  13-May-2009  jym Sync with HEAD.

Commit is split, to avoid a "too many arguments" protocol error.
 1.12.12.1  28-Apr-2009  skrll Sync with HEAD.
 1.12.4.1  04-May-2009  yamt sync with head.
 1.15.2.3  22-May-2014  yamt sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
 1.15.2.2  30-Oct-2012  yamt sync with head
 1.15.2.1  17-Apr-2012  yamt sync with head
 1.20.2.3  03-Dec-2017  jdolecek update from HEAD
 1.20.2.2  20-Aug-2014  tls Rebase to HEAD as of a few days ago.
 1.20.2.1  20-Nov-2012  tls Resync to 2012-11-19 00:00:00 UTC
 1.21.2.1  18-May-2014  rmind sync with head
 1.22.4.1  05-Jul-2016  snj Pull up following revision(s) (requested by sevan in ticket #1187):
sys/dev/adb/adb_kbd.c: revision 1.23
sys/dev/adb/adb_keymap.h: revisions 1.5, 1.6
sys/dev/adb/adb_usb_map.c: revision 1.2
nicely ask the keyboard to distinguish between left and right Control, Alt
and Shift keys.
Welcome to the world of accents and diacritics!
--
Add us.dvorak keymap variant for ADB keyboards. Addresses PR 51255.
Tested by sevan@.
 1.24.2.1  22-Sep-2015  skrll Sync with HEAD
 1.27.4.1  10-Jun-2019  christos Sync with HEAD
 1.30.4.1  02-Apr-2021  thorpej config_found_ia() -> config_found() w/ CFARG_IATTR.
 1.31.8.1  04-Aug-2021  thorpej Adapt to CFARGS().
 1.33.10.1  02-Aug-2025  perseant Sync with HEAD

RSS XML Feed