machine diskinfo command, toby is filling w/ meat at the moment

3 files changed, 57 insertions, 4 deletions

diff --git a/sys/arch/i386/stand/libsa/Makefile b/sys/arch/i386/stand/libsa/Makefile
index a09fc8e4cee..e84d626c0cd 100644
--- a/sys/arch/i386/stand/libsa/Makefile
+++ b/sys/arch/i386/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.24 1997/08/27 21:08:49 mickey Exp $
+#	$OpenBSD: Makefile,v 1.25 1997/09/02 20:58:15 mickey Exp $
 
 
 LIB=	sa
@@ -14,8 +14,8 @@ DIR_KERN=$S/lib/libkern
 
 # i386 stuff (so, it will possibly load in the same 64k)
 SRCS=	gidt.S debug_i386.S alloca.S \
-	machdep.c dev_i386.c exec_i386.c biosdev.c gateA20.c memprobe.c \
-	bioscons.c time.c
+	machdep.c dev_i386.c exec_i386.c cmd_i386.c \
+	biosdev.c bioscons.c gateA20.c memprobe.c time.c
 
 # stand routines
 SRCS+=	alloc.c exit.c exec.c getfile.c gets.c globals.c strcmp.c strlen.c \
@@ -57,4 +57,5 @@ install:
 .include <bsd.lib.mk>
 
 CPPFLAGS+=-DLINKADDR=${LINKADDR} -DHEAP_LIMIT=${HEAP_LIMIT} ${DEBUGFLAGS}
+CPPFLAGS+=-I${.CURDIR}/../boot
 CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD
diff --git a/sys/arch/i386/stand/libsa/cmd_i386.c b/sys/arch/i386/stand/libsa/cmd_i386.c
new file mode 100644
index 00000000000..01323e545cb
--- /dev/null
+++ b/sys/arch/i386/stand/libsa/cmd_i386.c
@@ -0,0 +1,51 @@
+/*	$OpenBSD: cmd_i386.c,v 1.1 1997/09/02 20:58:15 mickey Exp $	*/
+
+/*
+ * Copyright (c) 1997 Michael Shalayeff, Tobias Weingartner
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Michael Shalayeff.
+ * 4. 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 REGENTS OR CONTRIBUTORS 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.
+ *
+ */
+
+#include <sys/param.h>
+#include "libsa.h"
+#include <cmd.h>
+
+static int Xdiskinfo __P((void));
+
+const struct cmd_table cmd_machine[] = {
+	{ "diskinfo", CMDT_CMD, Xdiskinfo },
+	{ NULL, 0 }
+};
+
+static int
+Xdiskinfo()
+{
+	return 0;
+}
+
diff --git a/sys/arch/i386/stand/libsa/libsa.h b/sys/arch/i386/stand/libsa/libsa.h
index d11f8a1815f..c6574f6c14a 100644
--- a/sys/arch/i386/stand/libsa/libsa.h
+++ b/sys/arch/i386/stand/libsa/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.15 1997/08/22 20:13:43 mickey Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.16 1997/09/02 20:58:16 mickey Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -45,3 +45,4 @@ extern const char bdevs[][4];
 extern const int nbdevs;
 extern int bootdev; /* XXX pass through the global to exec_i386 */
 
+#define MACHINE_CMD	cmd_machine /* we have i386 specific sommands */