Thu Mar 8 16:43:05 2012 UTC ()
Prevent expansion of $NetBSD$ that should be placed verbatim into output.


(jakllsch)
diff -r1.9 -r1.10 src/sys/dev/microcode/cyclades-z/cyzfirm2h.c
cvs diff -r1.9 -r1.10 src/sys/dev/microcode/cyclades-z/cyzfirm2h.c (expand / switch to unified diff)

--- src/sys/dev/microcode/cyclades-z/cyzfirm2h.c 2012/03/08 16:40:37 1.9
+++ src/sys/dev/microcode/cyclades-z/cyzfirm2h.c 2012/03/08 16:43:04 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cyzfirm2h.c,v 1.9 2012/03/08 16:40:37 jakllsch Exp $ */ 1/* $NetBSD: cyzfirm2h.c,v 1.10 2012/03/08 16:43:04 jakllsch Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2000 Zembu Labs, Inc. 4 * Copyright (c) 2000 Zembu Labs, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Author: Jason R. Thorpe <thorpej@zembu.com> 7 * Author: Jason R. Thorpe <thorpej@zembu.com>
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -29,27 +29,27 @@ @@ -29,27 +29,27 @@
29 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 29 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
30 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 30 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
31 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 31 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34 */ 34 */
35 35
36/* 36/*
37 * This program converts a binary Cyclades-Z firmware file into a 37 * This program converts a binary Cyclades-Z firmware file into a
38 * C header file for use in a device driver. 38 * C header file for use in a device driver.
39 */ 39 */
40 40
41#include <sys/cdefs.h> 41#include <sys/cdefs.h>
42__RCSID("$NetBSD: cyzfirm2h.c,v 1.9 2012/03/08 16:40:37 jakllsch Exp $"); 42__RCSID("$NetBSD: cyzfirm2h.c,v 1.10 2012/03/08 16:43:04 jakllsch Exp $");
43 43
44#include <sys/types.h> 44#include <sys/types.h>
45#include <sys/mman.h> 45#include <sys/mman.h>
46#include <err.h> 46#include <err.h>
47#include <ctype.h> 47#include <ctype.h>
48#include <fcntl.h> 48#include <fcntl.h>
49#include <string.h> 49#include <string.h>
50#include <stdio.h> 50#include <stdio.h>
51#include <stdlib.h> 51#include <stdlib.h>
52#include <unistd.h> 52#include <unistd.h>
53 53
54int main(int argc, char *argv[]); 54int main(int argc, char *argv[]);
55void usage(void); 55void usage(void);
@@ -89,27 +89,27 @@ main(int argc, char *argv[]) @@ -89,27 +89,27 @@ main(int argc, char *argv[])
89 *cp = '_'; 89 *cp = '_';
90 } 90 }
91 91
92 in_len = lseek(i, 0, SEEK_END); 92 in_len = lseek(i, 0, SEEK_END);
93 if (in_len == (off_t) -1) 93 if (in_len == (off_t) -1)
94 err(1, "unable to determine length of input file"); 94 err(1, "unable to determine length of input file");
95 95
96 in_ptr = mmap(NULL, in_len, PROT_READ, MAP_FILE|MAP_SHARED, 96 in_ptr = mmap(NULL, in_len, PROT_READ, MAP_FILE|MAP_SHARED,
97 i, (off_t) 0); 97 i, (off_t) 0);
98 if (in_ptr == MAP_FAILED) 98 if (in_ptr == MAP_FAILED)
99 err(1, "unable to mmap input file"); 99 err(1, "unable to mmap input file");
100 (void) close(i); 100 (void) close(i);
101 101
102 fprintf(out_file, "/*\t$NetBSD: cyzfirm2h.c,v 1.9 2012/03/08 16:40:37 jakllsch Exp $\t*/\n\n"); 102 fprintf(out_file, "/*\t$""NetBSD""$\t*/\n\n");
103 fprintf(out_file, 103 fprintf(out_file,
104 "/*\n" 104 "/*\n"
105 " * Firmware for Cyclades Z series multiport serial boards.\n" 105 " * Firmware for Cyclades Z series multiport serial boards.\n"
106 " * Automatically generated from:\n" 106 " * Automatically generated from:\n"
107 " *\n" 107 " *\n"
108 " *\t%s\n" 108 " *\t%s\n"
109 " */\n\n", argv[1]); 109 " */\n\n", argv[1]);
110 fprintf(out_file, "#ifndef _%s_\n", include_name); 110 fprintf(out_file, "#ifndef _%s_\n", include_name);
111 fprintf(out_file, "#define\t_%s_\n\n", include_name); 111 fprintf(out_file, "#define\t_%s_\n\n", include_name);
112 112
113 fprintf(out_file, "static const uint8_t cycladesz_firmware[] = {\n"); 113 fprintf(out_file, "static const uint8_t cycladesz_firmware[] = {\n");
114 114
115 i = 0; 115 i = 0;