diff options
| -rw-r--r-- | etc/etc.landisk/sysctl.conf | 1 | ||||
| -rw-r--r-- | sys/arch/landisk/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/landisk/conf/files.landisk | 8 | ||||
| -rw-r--r-- | sys/arch/landisk/dev/power.c | 110 | ||||
| -rw-r--r-- | sys/arch/landisk/landisk/landiskreg.h | 4 | ||||
| -rw-r--r-- | sys/arch/sh/include/cpu.h | 6 | ||||
| -rw-r--r-- | sys/arch/sh/sh/sh_machdep.c | 9 |
7 files changed, 133 insertions, 10 deletions
diff --git a/etc/etc.landisk/sysctl.conf b/etc/etc.landisk/sysctl.conf index e69de29bb2d..c6ef3da7d11 100644 --- a/etc/etc.landisk/sysctl.conf +++ b/etc/etc.landisk/sysctl.conf @@ -0,0 +1 @@ +#machdep.kbdreset=1 # permit console to do a nice halt diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC index 1b5ebf71dbe..28d1ebb8912 100644 --- a/sys/arch/landisk/conf/GENERIC +++ b/sys/arch/landisk/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.9 2006/12/18 00:46:25 martin Exp $ +# $OpenBSD: GENERIC,v 1.10 2007/01/15 22:22:18 martin Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -48,6 +48,9 @@ option SCIFCONSOLE option SCIFCN_SPEED=9600 scif0 at shb? +# Power switch +power0 at obio? + rsclock0 at shb? wdc0 at obio? port 0x14000000 irq 10 # CF diff --git a/sys/arch/landisk/conf/files.landisk b/sys/arch/landisk/conf/files.landisk index 2a165360c40..6ebf4216410 100644 --- a/sys/arch/landisk/conf/files.landisk +++ b/sys/arch/landisk/conf/files.landisk @@ -1,4 +1,4 @@ -# $OpenBSD: files.landisk,v 1.4 2006/11/20 17:56:03 drahn Exp $ +# $OpenBSD: files.landisk,v 1.5 2007/01/15 22:22:18 martin Exp $ # $NetBSD: files.landisk,v 1.2 2006/09/07 01:55:02 uwe Exp $ # maxpartitions must be first item in files.${MACHINE} @@ -101,9 +101,9 @@ device btn: button attach btn at obio with btn_obio file arch/landisk/dev/btn_obio.c btn_obio needs-flag -device pwrsw -attach pwrsw at obio with pwrsw_obio -file arch/landisk/dev/pwrsw_obio.c pwrsw_obio needs-flag +device power +attach power at obio +file arch/landisk/dev/power.c power needs-flag #device led #attach led at obio diff --git a/sys/arch/landisk/dev/power.c b/sys/arch/landisk/dev/power.c new file mode 100644 index 00000000000..7553d724b5c --- /dev/null +++ b/sys/arch/landisk/dev/power.c @@ -0,0 +1,110 @@ +/* $OpenBSD: power.c,v 1.1 2007/01/15 22:22:18 martin Exp $ */ + +/* + * Copyright (c) 2007 Martin Reindl. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <sys/types.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/device.h> +#include <sys/conf.h> +#include <sys/proc.h> +#include <sys/signalvar.h> + +#include <machine/bus.h> +#include <machine/autoconf.h> + +#include <sh/include/devreg.h> + +#include <landisk/landisk/landiskreg.h> +#include <landisk/dev/obiovar.h> + +struct power_softc { + struct device sc_dev; + void *sc_ih; +}; + +int power_match(struct device *, void *, void *); +void power_attach(struct device *, struct device *, void *); +int power_intr(void *aux); + +struct cfattach power_ca = { + sizeof(struct power_softc), + power_match, + power_attach +}; + +struct cfdriver power_cd = { + NULL, "power", DV_DULL +}; + +struct power_softc *power_softc; + +int +power_match(struct device *parent, void *match, void *aux) +{ + struct obio_attach_args *oa = aux; + + oa->oa_nio = 0; + oa->oa_niomem = 0; + oa->oa_nirq = 1; + oa->oa_irq[0].or_irq = LANDISK_INTR_PWRSW; + + return (1); +} + +void +power_attach(struct device *parent, struct device *self, void *aux) +{ + struct power_softc *sc = (void *)self; + + power_softc = sc; + + sc->sc_ih = extintr_establish(LANDISK_INTR_PWRSW, IPL_TTY, + power_intr, sc, sc->sc_dev.dv_xname); + if (sc->sc_ih == NULL) { + printf(": couldn't map interrupt"); + return; + } + + printf("\n"); +} + +int +power_intr(void *arg) +{ + extern int kbd_reset; + int status; + + status = (int8_t)_reg_read_1(LANDISK_BTNSTAT); + if (status == -1) { + return (0); + } + + status = ~status; + if ((status & BTN_POWER_BIT) && (kbd_reset == 1)) { +#ifdef DEBUG + printf("%s switched\n", sc->sc_dev.dv_xname); +#endif + Debugger(); + kbd_reset = 0; + _reg_write_1(LANDISK_PWRSW_INTCLR, 1); + psignal(initproc, SIGUSR1); + return (1); + } + return (0); +} diff --git a/sys/arch/landisk/landisk/landiskreg.h b/sys/arch/landisk/landisk/landiskreg.h index c4cf17bd774..67d4fa1bacb 100644 --- a/sys/arch/landisk/landisk/landiskreg.h +++ b/sys/arch/landisk/landisk/landiskreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: landiskreg.h,v 1.2 2006/12/18 22:11:29 martin Exp $ */ +/* $OpenBSD: landiskreg.h,v 1.3 2007/01/15 22:22:19 martin Exp $ */ /* $NetBSD: landiskreg.h,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ /*- @@ -55,7 +55,7 @@ #define INTEN_PCI3 0x08 /* ohci1 */ #define INTEN_ICONNECT 0x10 /* wdc1 at obio */ #define INTEN_CFIDE 0x20 /* wdc0 at obio */ -#define INTEN_PWRSW 0x40 /* pwrsw at obio */ +#define INTEN_PWRSW 0x40 /* power at obio */ #define INTEN_BTN 0x80 /* btn at obio */ #define LANDISK_INTR_PCI0 5 /* re/ehci */ diff --git a/sys/arch/sh/include/cpu.h b/sys/arch/sh/include/cpu.h index b7d09e095c7..28bd05964d9 100644 --- a/sys/arch/sh/include/cpu.h +++ b/sys/arch/sh/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.3 2006/11/29 12:26:14 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.4 2007/01/15 22:22:19 martin Exp $ */ /* $NetBSD: cpu.h,v 1.41 2006/01/21 04:24:12 uwe Exp $ */ /*- @@ -187,11 +187,13 @@ extern int want_resched; /* need_resched() was called */ * CTL_MACHDEP definitions. */ #define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_MAXID 2 /* number of valid machdep ids */ +#define CPU_KBDRESET 2 /* keyboard reset */ +#define CPU_MAXID 3 /* number of valid machdep ids */ #define CTL_MACHDEP_NAMES { \ { 0, 0 }, \ { "console_device", CTLTYPE_STRUCT }, \ + { "kbdreset", CTLTYPE_INT }, \ } #ifdef _KERNEL diff --git a/sys/arch/sh/sh/sh_machdep.c b/sys/arch/sh/sh/sh_machdep.c index 0a8549d092f..a6903c0bd01 100644 --- a/sys/arch/sh/sh/sh_machdep.c +++ b/sys/arch/sh/sh/sh_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sh_machdep.c,v 1.6 2006/11/09 00:12:12 deraadt Exp $ */ +/* $OpenBSD: sh_machdep.c,v 1.7 2007/01/15 22:22:19 martin Exp $ */ /* $NetBSD: sh3_machdep.c,v 1.59 2006/03/04 01:13:36 uwe Exp $ */ /*- @@ -149,6 +149,8 @@ uint32_t dumpmag = 0x8fca0101; /* magic number */ int dumpsize; /* pages */ long dumplo; /* blocks */ +int kbd_reset; + void sh_cpu_init(int arch, int product) { @@ -676,6 +678,11 @@ cpu_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, sizeof consdev)); } + case CPU_KBDRESET: + if (securelevel > 0) + return (sysctl_rdint(oldp, oldlenp, newp, kbd_reset)); + return (sysctl_int(oldp, oldlenp, newp, newlen, &kbd_reset)); + default: return (EOPNOTSUPP); } |