firmware loading from the filesystem. pci subsystem type things

are still done early, but audio subsystem setup is deferred till
after root is mounted.  tested by mcbride

4 files changed, 97 insertions, 2 deletions

diff --git a/sys/dev/microcode/Makefile b/sys/dev/microcode/Makefile
index 9b5e36e5d36..ff73b6fe833 100644
--- a/sys/dev/microcode/Makefile
+++ b/sys/dev/microcode/Makefile
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile,v 1.8 2004/12/19 16:06:50 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 2004/12/20 12:29:40 deraadt Exp $
 
-SUBDIR=	atmel tigon neomagic symbol kue typhoon uyap cirruslogic
+SUBDIR=	atmel tigon neomagic symbol kue typhoon uyap cirruslogic yds
 
 .include <bsd.subdir.mk>
diff --git a/sys/dev/microcode/yds/Makefile b/sys/dev/microcode/yds/Makefile
new file mode 100644
index 00000000000..f76c30932f6
--- /dev/null
+++ b/sys/dev/microcode/yds/Makefile
@@ -0,0 +1,28 @@
+# $OpenBSD: Makefile,v 1.1 2004/12/20 12:29:40 deraadt Exp $
+
+NOPROG=
+NOMAN=
+
+# PCI capable systems only
+.if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \
+    (${MACHINE} == "alpha") || (${MACHINE} == "sparc64") || \
+    (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "cats") || \
+    (${MACHINE} == "hppa") || (${MACHINE} == "hppa64") || \
+    (${MACHINE} == "sgi")
+
+FIRM= 	yds
+
+CLEANFILES+= ${FIRM} build
+
+all:	build
+	${.OBJDIR}/build
+
+afterinstall:
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
+	    ${FIRM} ${DESTDIR}/etc/firmware
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
+	    ${.CURDIR}/yds-license ${DESTDIR}/etc/firmware
+.endif
+
+.include <bsd.prog.mk>
+
diff --git a/sys/dev/microcode/yds/build.c b/sys/dev/microcode/yds/build.c
new file mode 100644
index 00000000000..21900cd56a7
--- /dev/null
+++ b/sys/dev/microcode/yds/build.c
@@ -0,0 +1,59 @@
+/*	$OpenBSD: build.c,v 1.1 2004/12/20 12:29:40 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 2004 Theo de Raadt <deraadt@openbsd.org>
+ *
+ * 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 <dev/pci/ydsvar.h>
+#include <fcntl.h>
+#include <stdlib.h>
+
+#include "yds_hwmcode.h"
+
+#define FILENAME "yds"
+
+int
+main(int argc, char *argv[])
+{
+	struct	yds_firmware yfproto, *yf;
+	int len, fd, i;
+
+	len = sizeof(*yf) - sizeof(yfproto.data) +
+	    sizeof(yds_dsp_mcode) + sizeof(yds_ds1_ctrl_mcode) +
+	    sizeof(yds_ds1e_ctrl_mcode);
+
+	yf = (struct yds_firmware *)malloc(len);
+	bzero(yf, len);
+
+	yf->dsplen = sizeof(yds_dsp_mcode);
+	yf->ds1len = sizeof(yds_ds1_ctrl_mcode);
+	yf->ds1elen = sizeof(yds_ds1e_ctrl_mcode);
+
+	bcopy(yds_dsp_mcode, &yf->data[0], yf->dsplen);
+	bcopy(yds_ds1_ctrl_mcode, &yf->data[yf->dsplen], yf->ds1len);
+	bcopy(yds_ds1_ctrl_mcode, &yf->data[yf->dsplen + yf->ds1len],
+	    yf->ds1elen);
+
+	printf("creating %s length %d [%d+%d+%d]\n",
+	    FILENAME, len, yf->dsplen, yf->ds1len, yf->ds1elen);
+	fd = open(FILENAME, O_WRONLY|O_CREAT|O_TRUNC, 0644);
+	if (fd == -1)
+		err(1, FILENAME);
+
+	write(fd, yf, len);
+	free(yf);
+	close(fd);
+	return 0;
+}
diff --git a/sys/dev/microcode/yds/yds-license b/sys/dev/microcode/yds/yds-license
new file mode 100644
index 00000000000..2973aac22cf
--- /dev/null
+++ b/sys/dev/microcode/yds/yds-license
@@ -0,0 +1,8 @@
+ Copyright (c) 1997-1999  Yamaha Corporation. All Rights Reserved.
+
+ In private mail to deraadt@openbsd.org:
+ "Free distribution, No restriction for their distribution, We do not make
+ any support." -- suzuki-y@post.yamaha.co.jp
+
+
+This applies to the yds firmware.