Page MenuHomeFreeBSD

D46300.id142088.diff
No OneTemporary

D46300.id142088.diff

diff --git a/sys/tools/sdiodevs2h.awk b/sys/tools/sdiodevs2h.awk
--- a/sys/tools/sdiodevs2h.awk
+++ b/sys/tools/sdiodevs2h.awk
@@ -44,9 +44,6 @@
printf("/*\n") > file
printf(" * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \
> file
- printf(" *\n") > file
- printf(" * generated from:\n") > file
- printf(" *\t%s\n", VERSION) > file
printf(" */\n") > file
}
@@ -58,7 +55,7 @@
vendors[nvendors, 1] = $2; # name
vendors[nvendors, 2] = $3; # id
if (hfile)
- printf("#define\tSDIO_VENDOR_%s\t%s\t", vendors[nvendors, 1],
+ printf("#define\tSDIO_VENDOR_ID_%s\t%s\t", vendors[nvendors, 1],
vendors[nvendors, 2]) > hfile
i = 3; f = 4;
@@ -108,7 +105,7 @@
products[nproducts, 2] = $3; # product id
products[nproducts, 3] = $4; # id
if (hfile)
- printf("#define\tSDIO_PRODUCT_%s_%s\t%s\t", \
+ printf("#define\tSDIO_DEVICE_ID_%s_%s\t%s\t", \
products[nproducts, 1], products[nproducts, 2], \
products[nproducts, 3]) > hfile
@@ -158,7 +155,7 @@
printf("const struct sdio_knowndev sdio_knowndevs[] = {\n") > dfile
for (i = 1; i <= nproducts; i++) {
printf("\t{\n") > dfile
- printf("\t SDIO_VENDOR_%s, SDIO_PRODUCT_%s_%s,\n",
+ printf("\t SDIO_VENDOR_ID_%s, SDIO_DEVICE_ID_%s_%s,\n",
products[i, 1], products[i, 1], products[i, 2]) > dfile
printf("\t ") > dfile
printf("0") > dfile
@@ -192,7 +189,7 @@
}
for (i = 1; i <= nvendors; i++) {
printf("\t{\n") > dfile
- printf("\t SDIO_VENDOR_%s, 0,\n", vendors[i, 1]) > dfile
+ printf("\t SDIO_VENDOR_ID_%s, 0,\n", vendors[i, 1]) > dfile
printf("\t SDIO_KNOWNDEV_NOPROD,\n") > dfile
printf("\t \"") > dfile
j = 3;
@@ -233,13 +230,10 @@
while ((getline < srcfile) > 0) {
line++;
if (line == 1) {
- VERSION = $0
- gsub("\\$", "", VERSION)
if (dfile)
header(dfile)
if (hfile)
header(hfile)
- continue;
}
if ($1 == "vendor") {
vendor(hfile)

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 28, 5:41 PM (7 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17832141
Default Alt Text
D46300.id142088.diff (1 KB)

Event Timeline