Catch up with ACPI-CA 20070320 import.

1 files changed, 5 insertions, 5 deletions

diff --git a/sys/tools/acpi_quirks2h.awk b/sys/tools/acpi_quirks2h.awk
index 1aa08dc..3b4a0ae 100644
--- a/sys/tools/acpi_quirks2h.awk
+++ b/sys/tools/acpi_quirks2h.awk
@@ -78,7 +78,7 @@ $1 == "oem:" {
 	M = match (REMAINDER, /\"[^\"]*\"/);
 	OEM_TABLE_ID = substr(REMAINDER, M, RLENGTH);
 
-	printf("\t{ ACPI_TABLE_%s, OEM, {%s}, {%s} },\n",
+	printf("\t{ \"%s\", OEM, {%s}, {%s} },\n",
 	    TABLE, OEM_ID, OEM_TABLE_ID) > OUTPUT;
 }
 
@@ -92,7 +92,7 @@ $1 == "creator:" {
 	M = match ($0, /\"[^\"]*\"/);
 	CREATOR = substr($0, M, RLENGTH);
 
-	printf("\t{ ACPI_TABLE_%s, CREATOR, {%s} },\n",
+	printf("\t{ \"%s\", CREATOR, {%s} },\n",
 	    TABLE, CREATOR) > OUTPUT;
 }
 
@@ -107,7 +107,7 @@ $1 == "oem_rev:" {
 	# Parse operand
 	OPERAND = trans_sign(SIGN);
 
-	printf("\t{ ACPI_TABLE_%s, OEM_REV, {.op = %s}, {.rev = %s} },\n",
+	printf("\t{ \"%s\", OEM_REV, {.op = %s}, {.rev = %s} },\n",
 	    TABLE, OPERAND, VALUE) > OUTPUT;
 }
 
@@ -122,7 +122,7 @@ $1 == "creator_rev:" {
 	# Parse operand
 	OPERAND = trans_sign(SIGN);
 
-	printf("\t{ ACPI_TABLE_%s, CREATOR_REV, {.op = %s}, {.rev = %s} },\n",
+	printf("\t{ \"%s\", CREATOR_REV, {.op = %s}, {.rev = %s} },\n",
 	    TABLE, OPERAND, VALUE) > OUTPUT;
 }
 
@@ -130,7 +130,7 @@ $1 == "creator_rev:" {
 # QUIRKS field: This is the last line of every entry
 #
 $1 == "quirks:" {
-	printf("\t{ ACPI_TABLE_END }\n};\n\n") > OUTPUT;
+	printf("\t{ \"\" }\n};\n\n") > OUTPUT;
 
 	QUIRKS = $0;
 	sub(/^quirks:[ ]*/ , "", QUIRKS);