summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2007-04-05 16:41:07 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2007-04-05 16:41:07 +0000
commitd9a4c999176d4ebc12b88ac88f0dd165508d0850 (patch)
tree497b8cc0e3a076ad29bb5fb92b29e6d727ed5dba
parent5969f4e909139eced1a884d090ea38276a955c2e (diff)
We also don't need the microcode builder anymore.
-rw-r--r--sys/dev/microcode/bcw/Makefile5
-rw-r--r--sys/dev/microcode/bcw/build/Makefile8
-rw-r--r--sys/dev/microcode/bcw/build/build.c160
-rw-r--r--sys/dev/microcode/bcw/extract/Makefile8
-rw-r--r--sys/dev/microcode/bcw/extract/extract.c103
5 files changed, 0 insertions, 284 deletions
diff --git a/sys/dev/microcode/bcw/Makefile b/sys/dev/microcode/bcw/Makefile
deleted file mode 100644
index c73146c8aef..00000000000
--- a/sys/dev/microcode/bcw/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $OpenBSD: Makefile,v 1.1 2007/01/06 18:31:47 mglocker Exp $
-
-SUBDIR= build extract
-
-.include <bsd.subdir.mk>
diff --git a/sys/dev/microcode/bcw/build/Makefile b/sys/dev/microcode/bcw/build/Makefile
deleted file mode 100644
index 814022dca12..00000000000
--- a/sys/dev/microcode/bcw/build/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $OpenBSD: Makefile,v 1.1 2007/01/06 18:31:47 mglocker Exp $
-
-NOMAN=
-
-PROG= build
-SRCS= build.c
-
-.include <bsd.prog.mk>
diff --git a/sys/dev/microcode/bcw/build/build.c b/sys/dev/microcode/bcw/build/build.c
deleted file mode 100644
index 1413cb32964..00000000000
--- a/sys/dev/microcode/bcw/build/build.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* $OpenBSD: build.c,v 1.1 2007/01/06 18:31:47 mglocker Exp $ */
-
-/*
- * Copyright (c) 2006 Marcus Glocker <mglocker@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 <sys/stat.h>
-
-#include <err.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-//#define VERBOSE 1
-#define FILENAME "bcw-bcm43xx"
-
-struct header {
- char filename[64];
- int filesize;
- int fileoffset;
-};
-
-int
-main(int argc, char *argv[])
-{
- void *p;
- int i, j, offset;
- int fdout, fdin;
- int nfiles, headersize;
- int fwsize, totalsize;
- struct header h[argc - 1];
- struct stat s;
-
- if (argc < 2) {
- printf("%s <firmware files>\n", argv[0]);
- exit(1);
- }
-
- nfiles = argc - 1; /* number of firmware files */
- headersize = sizeof(h) + sizeof(nfiles); /* size of file header */
-
- /* initialize header struct */
- for (i = 1, j = 0, fwsize = 0; i < argc; i++, j++) {
- bzero(h[j].filename, sizeof(h[j].filename));
- strlcpy(h[j].filename, argv[i], sizeof(h[j].filename));
-
- if (stat(h[j].filename, &s) == -1)
- err(1, "header initialization failed");
-
- h[j].filesize = s.st_size;
- h[j].fileoffset = 0;
-
- fwsize += h[j].filesize;
-#ifdef VERBOSE
- printf("create header entry for %s (%d bytes)\n",
- h[j].filename, h[j].filesize);
-#endif
- }
-
- /* calculate total file size */
- totalsize = headersize + fwsize;
-#if VERBOSE
- printf("\n");
- printf("header size = %d bytes, ", headersize);
- printf("fw size = %d bytes, ", fwsize);
- printf("total file size = %d bytes\n", totalsize);
- printf("\n");
-#endif
-
- /* calculating firmware offsets */
- for (i = 0, offset = headersize; i < nfiles; i++) {
- h[i].fileoffset = offset;
- offset += h[i].filesize;
-#ifdef VERBOSE
- printf("offset of %s = %d\n", h[i].filename, h[i].fileoffset);
-#endif
- }
-
- /* open output file */
- if ((fdout = open(FILENAME, O_CREAT|O_TRUNC|O_RDWR, 0644)) == -1)
- err(1, "open output file failed");
-
- /* host to network byte order */
- for (i = 0; i < nfiles; i++) {
- h[i].filesize = htonl(h[i].filesize);
- h[i].fileoffset = htonl(h[i].fileoffset);
- }
- nfiles = htonl(nfiles);
-
- /* write header */
- if (write(fdout, &nfiles, sizeof(nfiles)) < 1) {
- close(fdout);
- err(1, "write header 1 to output file failed\n");
- }
- if (write(fdout, h, headersize - sizeof(nfiles)) < 1) {
- close(fdout);
- err(1, "write header 2 to output file failed\n");
- }
-
- /* network to host byte order */
- nfiles = ntohl(nfiles);
- for (i = 0; i < nfiles; i++) {
- h[i].filesize = ntohl(h[i].filesize);
- h[i].fileoffset = ntohl(h[i].fileoffset);
- }
-
- /* write each file */
- for (i = 0; i < nfiles; i++) {
- if ((fdin = open(h[i].filename, O_RDONLY)) == -1) {
- close(fdout);
- err(1, "open input file failed\n");
- }
- if ((p = malloc(h[i].filesize)) == NULL) {
- close(fdout);
- close(fdin);
- err(1, "malloc");
- }
- if (read(fdin, p, h[i].filesize) < 1) {
- free(p);
- close(fdout);
- close(fdin);
- err(1, "read input file failed\n");
- }
- if (write(fdout, p, h[i].filesize) < 1) {
- free(p);
- close(fdout);
- close(fdin);
- err(1, "write to output file failed\n");
- }
- free(p);
- close(fdin);
- }
-
- close(fdout);
-
-#ifdef VERBOSE
- printf("\n");
-#endif
-
- /* game over */
- printf("wrote %d files to %s (%d bytes).\n",
- nfiles, FILENAME, totalsize);
-
- return (0);
-}
diff --git a/sys/dev/microcode/bcw/extract/Makefile b/sys/dev/microcode/bcw/extract/Makefile
deleted file mode 100644
index 3805131b3d3..00000000000
--- a/sys/dev/microcode/bcw/extract/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $OpenBSD: Makefile,v 1.1 2007/01/06 18:31:47 mglocker Exp $
-
-NOMAN=
-
-PROG= extract
-SRCS= extract.c
-
-.include <bsd.prog.mk>
diff --git a/sys/dev/microcode/bcw/extract/extract.c b/sys/dev/microcode/bcw/extract/extract.c
deleted file mode 100644
index c8e23c7fc85..00000000000
--- a/sys/dev/microcode/bcw/extract/extract.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* $OpenBSD: extract.c,v 1.1 2007/01/06 18:31:47 mglocker Exp $ */
-
-/*
- * Copyright (c) 2006 Marcus Glocker <mglocker@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 <sys/stat.h>
-
-#include <err.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-struct header {
- char filename[64];
- int filesize;
- int fileoffset;
-};
-
-int
-main(int argc, char *argv[])
-{
- int i, fdin, fdout, nfiles;
- void *p;
- struct header **h;
-
- if (argc < 2) {
- printf("%s <firmware file>\n", argv[0]);
- exit(1);
- }
-
- /* open firmware file */
- if ((fdin = open(argv[1], O_RDONLY)) == -1)
- err(1, "open of input file failed");
-
- /* read first header */
- if (read(fdin, &nfiles, sizeof(nfiles)) < 1)
- err(1, "first header parse failed");
- nfiles = ntohl(nfiles);
-
- /* allocate space for header struct */
- if ((h = malloc(nfiles * sizeof(*h))) == NULL)
- err(1, "malloc");
- for (i = 0; i < nfiles; i++) {
- if ((h[i] = malloc(sizeof(struct header))) == NULL)
- err(1, "malloc");
- }
-
- /* read header */
- for (i = 0; i < nfiles; i++) {
- if (read(fdin, h[i]->filename, sizeof(h[i]->filename)) < 1)
- err(1, "filename header read failed\n");
- if (read(fdin, &h[i]->filesize, sizeof(h[i]->filesize)) < 1)
- err(1, "filesize header read failed\n");
- h[i]->filesize = htonl(h[i]->filesize);
- if (read(fdin, &h[i]->fileoffset, sizeof(h[i]->fileoffset)) < 1)
- err(1, "fileoffset header read failed\n");
- h[i]->fileoffset = htonl(h[i]->fileoffset);
- }
-
- /* write each file */
- for (i = 0; i < nfiles; i++) {
- if ((fdout = open(h[i]->filename, O_CREAT|O_TRUNC|O_RDWR, 0644))
- == -1)
- err(1, "open of output file failed");
- if ((p = malloc(h[i]->filesize)) == NULL)
- err(1, "malloc");
- if (lseek(fdin, h[i]->fileoffset, SEEK_SET) == -1)
- err(1, "lseek");
- if (read(fdin, p, h[i]->filesize) < 1)
- err(1, "read from input file failed");
- if (write(fdout, p, h[i]->filesize) < 1)
- err(1, "write to output file failed");
- free(p);
- close(fdout);
- printf("extracting %s (filesize %d, fileoffset %d)\n",
- h[i]->filename, h[i]->filesize, h[i]->fileoffset);
- }
-
- /* free header space */
- for (i = 0; i < nfiles; i++)
- free(h[i]);
- free(h);
-
- /* game over */
- close (fdin);
-
- return (0);
-}