d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No need to check if devd is running before posting an event.

Browse Source
This commit is contained in:
jhibbits 2014-06-21 00:53:56 +00:00
parent 21bd32e7b4
commit a73dfd94aa
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/adb/adb_buttons.c
View File

@ -118,37 +118,32 @@ abtn_receive_packet(device_t dev, u_char status,
switch (cmd) {
case 0x0a: /* decrease brightness */
if (devctl_process_running())
devctl_notify("PMU", "keys", "brightness",
"notify=down");
devctl_notify("PMU", "keys", "brightness",
"notify=down");
break;
case 0x09: /* increase brightness */
if (devctl_process_running())
devctl_notify("PMU", "keys", "brightness", "notify=up");
devctl_notify("PMU", "keys", "brightness", "notify=up");
break;
case 0x08: /* mute */
case 0x01: /* mute, AV hardware */
if (devctl_process_running())
devctl_notify("PMU", "keys", "mute", NULL);
devctl_notify("PMU", "keys", "mute", NULL);
break;
case 0x07: /* decrease volume */
case 0x02: /* decrease volume, AV hardware */
if (devctl_process_running())
devctl_notify("PMU", "keys", "volume", "notify=down");
devctl_notify("PMU", "keys", "volume", "notify=down");
break;
case 0x06: /* increase volume */
case 0x03: /* increase volume, AV hardware */
if (devctl_process_running())
devctl_notify("PMU", "keys", "volume", "notify=up");
devctl_notify("PMU", "keys", "volume", "notify=up");
break;
case 0x0c: /* mirror display key */
/* Need callback to do something with this */
break;
case 0x0b: /* eject tray */
if (devctl_process_running())
devctl_notify("PMU", "keys", "eject", NULL);
devctl_notify("PMU", "keys", "eject", NULL);
break;
case 0x7f: /* numlock */
/* Need callback to do something with this */
break;

2
sys/dev/adb/adb_kbd.c
View File

@ -424,7 +424,7 @@ adb_kbd_receive_packet(device_t dev, u_char status,
mtx_lock(&sc->sc_mutex);
/* 0x7f is always the power button */
if (data[0] == 0x7f && devctl_process_running()) {
if (data[0] == 0x7f) {
devctl_notify("PMU", "Button", "pressed", NULL);
mtx_unlock(&sc->sc_mutex);
return (0);