Module Name: src
Committed By: nisimura
Date: Sun Apr 8 12:11:58 UTC 2012
Modified Files:
src/sys/arch/sandpoint/sandpoint: satmgr.c
Log Message:
Add an entry for "miconv2" satellite processor control. The button
press event handler remains unimplemented for now. Use /dev/satmgr
to talk the processor.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sandpoint/sandpoint/satmgr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/sandpoint/satmgr.c
diff -u src/sys/arch/sandpoint/sandpoint/satmgr.c:1.16 src/sys/arch/sandpoint/sandpoint/satmgr.c:1.17
--- src/sys/arch/sandpoint/sandpoint/satmgr.c:1.16 Wed Feb 22 22:56:44 2012
+++ src/sys/arch/sandpoint/sandpoint/satmgr.c Sun Apr 8 12:11:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: satmgr.c,v 1.16 2012/02/22 22:56:44 nisimura Exp $ */
+/* $NetBSD: satmgr.c,v 1.17 2012/04/08 12:11:57 nisimura Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -139,6 +139,7 @@ static void dbutton(struct satmgr_softc
static void ibutton(struct satmgr_softc *, int);
static void idosync(void *);
static void iprepcmd(struct satmgr_softc *, int, int, int, int, int, int);
+static void mbutton(struct satmgr_softc *, int);
static void guarded_pbutton(void *);
static void sched_sysmon_pbutton(void *);
@@ -154,6 +155,7 @@ static struct satops satmodel[] = {
{ "dlink", NULL, NULL, dpwroff, dbutton },
{ "iomega", iinit, ireboot, ipwroff, ibutton },
{ "kurobox", NULL, kreboot, kpwroff, kbutton },
+ { "miconv2", NULL, NULL, NULL, mbutton },
{ "qnap", qinit, qreboot, qpwroff, qbutton },
{ "synology", sinit, sreboot, spwroff, sbutton }
};
@@ -950,6 +952,12 @@ iprepcmd(struct satmgr_softc *sc, int po
}
static void
+mbutton(struct satmgr_softc *sc, int ch)
+{
+ /* do nothing */
+}
+
+static void
guarded_pbutton(void *arg)
{
struct satmgr_softc *sc = arg;
