diff options
| author | pgoyette <pgoyette@NetBSD.org> | 2019-01-27 02:08:33 +0000 |
|---|---|---|
| committer | pgoyette <pgoyette@NetBSD.org> | 2019-01-27 02:08:33 +0000 |
| commit | cc17ee2ece085d7d746bcd8fa9be19170855aaac (patch) | |
| tree | 5be40613f405cb081b2c44410b1506781927f8e3 /sys/dev/sysmon | |
| parent | 10dd4cc92542aa04b0e59469a484a48e4c3cdd24 (diff) | |
Merge the [pgoyette-compat] branch
Diffstat (limited to 'sys/dev/sysmon')
| -rw-r--r-- | sys/dev/sysmon/sysmon_power.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/sys/dev/sysmon/sysmon_power.c b/sys/dev/sysmon/sysmon_power.c index 7872d425d45..97065e2f92e 100644 --- a/sys/dev/sysmon/sysmon_power.c +++ b/sys/dev/sysmon/sysmon_power.c @@ -1,4 +1,4 @@ -/* $NetBSD: sysmon_power.c,v 1.58 2017/10/25 08:12:39 maya Exp $ */ +/* $NetBSD: sysmon_power.c,v 1.59 2019/01/27 02:08:42 pgoyette Exp $ */ /*- * Copyright (c) 2007 Juan Romero Pardines. @@ -69,7 +69,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.58 2017/10/25 08:12:39 maya Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.59 2019/01/27 02:08:42 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -89,6 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.58 2017/10/25 08:12:39 maya Exp $ #include <sys/rndsource.h> #include <sys/module.h> #include <sys/once.h> +#include <sys/compat_stub.h> #include <dev/sysmon/sysmonvar.h> #include <prop/proplib.h> @@ -344,16 +345,10 @@ sysmon_power_daemon_task(struct power_event_dictionary *ped, (struct sysmon_pswitch *)pev_data; pev.pev_type = POWER_EVENT_SWITCH_STATE_CHANGE; -#ifdef COMPAT_40 - pev.pev_switch.psws_state = event; - pev.pev_switch.psws_type = pswitch->smpsw_type; - - if (pswitch->smpsw_name) { - (void)strlcpy(pev.pev_switch.psws_name, - pswitch->smpsw_name, - sizeof(pev.pev_switch.psws_name)); - } -#endif + + MODULE_CALL_VOID_HOOK(compat_sysmon_power_40_hook, + (&pev, pswitch, event), __nothing); + error = sysmon_power_make_dictionary(ped->dict, pswitch, event, |
