src - OpenBSD base system

diff options


context:
space:
mode:

author	Ted Unangst <tedu@cvs.openbsd.org>	2014-07-12 21:56:58 +0000
committer	Ted Unangst <tedu@cvs.openbsd.org>	2014-07-12 21:56:58 +0000
commit	232a8b87a2b27121dfe1194d05856cb2d69ce263 (patch)
tree	4ebe47c54f389f67c0e15ee0ce47f5c4432940c2 /sys/dev/microcode
parent	55a05995977ff661af3b9e512515abc461867ca5 (diff)

"Dr. Jones. Again we see there is nothing you can possess which I cannot

take away." remove uyap. no effect except on hppa where it was strangely enabled.

Diffstat (limited to 'sys/dev/microcode')

-rw-r--r--

sys/dev/microcode/Makefile

-rw-r--r--

sys/dev/microcode/uyap/Makefile

-rw-r--r--

sys/dev/microcode/uyap/build.c

-rw-r--r--

sys/dev/microcode/uyap/uyap-license

-rw-r--r--

sys/dev/microcode/uyap/uyap_firmware.h

1231

5 files changed, 2 insertions, 1367 deletions

diff --git a/sys/dev/microcode/Makefile b/sys/dev/microcode/Makefile
index 28eda4e62c2..92ae0ea7a14 100644
--- a/sys/dev/microcode/Makefile
+++ b/sys/dev/microcode/Makefile

@@ -1,6 +1,6 @@

-# $OpenBSD: Makefile,v 1.22 2011/06/20 05:04:11 deraadt Exp $

+# $OpenBSD: Makefile,v 1.23 2014/07/12 21:56:57 tedu Exp $

SUBDIR= afb atmel bnx cirruslogic fxp kue neomagic myx ral rum \

- symbol tigon tht tusb3410 typhoon udl uyap yds zydas

+ symbol tigon tht tusb3410 typhoon udl yds zydas

.include <bsd.subdir.mk>

diff --git a/sys/dev/microcode/uyap/Makefile b/sys/dev/microcode/uyap/Makefile
deleted file mode 100644
index 125110d5aa5..00000000000
--- a/sys/dev/microcode/uyap/Makefile
+++ /dev/null

@@ -1,36 +0,0 @@

-# $OpenBSD: Makefile,v 1.8 2013/03/25 17:40:12 deraadt Exp $

-NOPROG=

-NOMAN=

-CC=${HOSTCC}

-# USB capable systems only

-.if (${MACHINE_ARCH} == "powerpc" || \

- ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \

- ${MACHINE} == "armish" || ${MACHINE} == "hppa" || \

- ${MACHINE} == "hppa64" || ${MACHINE} == "i386" || \

- ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \

- ${MACHINE} == "sgi" || \

- ${MACHINE} == "sparc64" || ${MACHINE} == "zaurus")

-FIRM= uyap

-PROG= build

-CLEANFILES+= ${FIRM} ${PROG}

-all: ${FIRM}

-${FIRM}: build

- ${.OBJDIR}/build

-realinstall:

-afterinstall:

- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \

- ${FIRM} ${DESTDIR}/etc/firmware

- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \

- ${.CURDIR}/uyap-license ${DESTDIR}/etc/firmware

-.endif

-.include <bsd.prog.mk>

diff --git a/sys/dev/microcode/uyap/build.c b/sys/dev/microcode/uyap/build.c
deleted file mode 100644
index 2e2aa6d9fc7..00000000000
--- a/sys/dev/microcode/uyap/build.c
+++ /dev/null

@@ -1,70 +0,0 @@

-/* $OpenBSD: build.c,v 1.5 2009/08/07 00:10:17 martynas Exp $ */

-/*

- *

- * 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/uio.h>

-#include <fcntl.h>

-#include <sys/param.h>

-#include <stdio.h>

-#include <err.h>

-#include <dev/usb/ezload.h>

-#include "uyap_firmware.h"

-#define FILENAME "uyap"

-int

-main(int argc, char *argv[])

- const struct ezdata *ptr;

- u_int16_t address;

- int fd;

- printf("creating %s length %d\n", FILENAME, sizeof uyap_firmware);

- fd = open(FILENAME, O_WRONLY|O_CREAT|O_TRUNC, 0644);

- if (fd == -1)

- err(1, "%s", FILENAME);

- for (ptr = uyap_firmware; ; ptr++) {

- struct iovec iov[3];

- u_int8_t length;

- ssize_t tlen, rlen;

- length = ptr->length;

- iov[0].iov_base = &length;

- iov[0].iov_len = 1;

- address = htole16(ptr->address);

- iov[1].iov_base = &address;

- iov[1].iov_len = 2;

- iov[2].iov_base = ptr->data;

- iov[2].iov_len = ptr->length;

- tlen = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;

- rlen = writev(fd, iov, 3);

- if (rlen == -1)

- err(1, "%s", FILENAME);

- if (rlen != tlen)

- err(1, "%s: short write", FILENAME);

- if (ptr->length == 0)

- break;

- }

- return 0;

diff --git a/sys/dev/microcode/uyap/uyap-license b/sys/dev/microcode/uyap/uyap-license
deleted file mode 100644
index ebc691be31f..00000000000
--- a/sys/dev/microcode/uyap/uyap-license
+++ /dev/null

@@ -1,28 +0,0 @@

- *

- * This code is derived from software contributed to The NetBSD Foundation

- * by Silicon Portals.

- *

- * 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.

- *

- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS

- * ``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 FOUNDATION 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.

-This is the firmware that is loaded for the uyap(4) driver.

diff --git a/sys/dev/microcode/uyap/uyap_firmware.h b/sys/dev/microcode/uyap/uyap_firmware.h
deleted file mode 100644
index 47fa400a3ef..00000000000
--- a/sys/dev/microcode/uyap/uyap_firmware.h
+++ /dev/null

@@ -1,1231 +0,0 @@

-/* $OpenBSD: uyap_firmware.h,v 1.3 2008/06/26 05:42:16 ray Exp $ */

-/* $NetBSD: uyap_firmware.h,v 1.2 2001/01/16 03:10:09 augustss Exp $ */