Add "beep" subcommand.

Obtained from:	PAO3
Reviewed by:	-current list

3 files changed, 82 insertions, 3 deletions

diff --git a/usr.sbin/pccard/pccardc/Makefile b/usr.sbin/pccard/pccardc/Makefile
index 095b1cf..8a4ac9a 100644
--- a/usr.sbin/pccard/pccardc/Makefile
+++ b/usr.sbin/pccard/pccardc/Makefile
@@ -1,11 +1,11 @@
 #
 #	pccardc Makefile
 #
-#	$Id: Makefile,v 1.6 1997/02/22 16:08:35 peter Exp $
+#	$Id: Makefile,v 1.7 1998/02/26 14:36:00 hosokawa Exp $
 #
 PROG=	pccardc
 NOMAN=	noman
-SRCS=	dumpcis.c enabler.c pccardc.c pccardmem.c printcis.c \
+SRCS=	beep.c dumpcis.c enabler.c pccardc.c pccardmem.c printcis.c \
 	rdattr.c rdmap.c rdreg.c readcis.c wrattr.c wrreg.c
 
 CFLAGS+=	-I${.CURDIR}/../pccardd
diff --git a/usr.sbin/pccard/pccardc/beep.c b/usr.sbin/pccard/pccardc/beep.c
new file mode 100644
index 0000000..b2dba5a
--- /dev/null
+++ b/usr.sbin/pccard/pccardc/beep.c
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 1995 Andrew McRae.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Code cleanup, bug-fix and extension
+ * by Tatsumi Hosokawa <hosokawa@mt.cs.keio.ac.jp>
+ */
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#include <ctype.h>
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+
+#include <pccard/cardinfo.h>
+
+int
+beep_main(argc, argv)
+	int     argc;
+	char   *argv[];
+{
+	int     fd, newstat, valid = 1;
+	char    name[64], *p;
+
+	if (argc != 2)
+		valid = 0;
+	if (valid) {
+		for (p = argv[1]; *p; p++) {
+			if (!isdigit(*p)) {
+				valid = 0;
+				break;
+			}
+		}
+	}
+	if (!valid)
+		errx(1, "Usage: %s beep newstat", argv[0]);
+
+	sscanf(argv[1], "%d", &newstat);
+	sprintf(name, CARD_DEVICE, 0);
+	fd = open(name, O_RDWR);
+	if (fd < 0)
+		err(1, "%s", name);
+	if (ioctl(fd, PIOCSBEEP, &newstat) < 0)
+		err(1, "ioctl (PIOCSBEEP)");
+	return 0;
+}
diff --git a/usr.sbin/pccard/pccardc/pccardc.c b/usr.sbin/pccard/pccardc/pccardc.c
index c925ea4..2a42b08 100644
--- a/usr.sbin/pccard/pccardc/pccardc.c
+++ b/usr.sbin/pccard/pccardc/pccardc.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: pccardc.c,v 1.6 1997/10/06 11:35:54 charnier Exp $";
+	"$Id: pccardc.c,v 1.7 1998/02/26 14:36:01 hosokawa Exp $";
 #endif /* not lint */
 
 #include <err.h>
@@ -36,6 +36,7 @@ static const char rcsid[] =
 typedef int (*main_t)(int, char **);
 
 #define DECL(foo) int foo(int, char**);
+DECL(beep_main);
 DECL(dumpcis_main);
 DECL(enabler_main);
 DECL(help_main);
@@ -51,6 +52,7 @@ struct {
 	main_t  func;
 	char   *help;
 } subcommands[] = {
+	{ "beep", beep_main, "Beep type" },
 	{ "dumpcis", dumpcis_main, "Prints CIS for all cards" },
 	{ "enabler", enabler_main, "Device driver enabler" },
 	{ "help", help_main, "Prints command summary" },