Changeset 60582 in vbox

Timestamp:

Apr 19, 2016 5:02:41 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106716

Message:

Devices/*.dsl: introduce some newlines to make recent versions of IASL happy

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• PC/vbox-cpuhotplug.dsl (modified) (5 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -828 +828 @@
         $(QUIET)$(RM) -f $@ [email protected] [email protected]
         $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -x c -o [email protected] $<
-        $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ [email protected]
+        $(QUIET)$(SED) "s/<NL>/\n/g" \
+                --output [email protected] [email protected]
+        $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ [email protected]
         $(QUIET)$(MV) -f $@ [email protected]
         $(QUIET)$(SED) "s/AmlCode/AmlCodeSsdtCpuHotPlug/g" \
                 --output $@ [email protected]
-        $(QUIET)$(RM) -f [email protected] [email protected]
+        $(QUIET)$(RM) -f [email protected] [email protected] [email protected]
 
 

trunk/src/VBox/Devices/PC/vbox-cpuhotplug.dsl

@@ -43 +43 @@
     {
 
-#define GENERATE_CPU_OBJECT(id, sck, sckuid, cpu, cpuuid)                  \
+#define GENERATE_CPU_OBJECT(id, sck, sckuid, cpu, cpuuid)<NL>              \
     Device (sck)                                                           \
     {                                                                      \
@@ -49 +49 @@
         Name (_UID, sckuid)                                                \
                                                                            \
-                                                                           \
+        <NL>                                                               \
         Processor (cpu, /* Name */                                         \
                    id,  /* Id */                                           \
@@ -59 +59 @@
             Name (_UID, cpuuid)                                            \
             Name (_PXM, 0x00)                                              \
-                                                                           \
+            <NL>                                                           \
             Method(_MAT, 0)                                                \
             {                                                              \
@@ -73 +73 @@
                 Return (APIC)                                              \
             }                                                              \
+            <NL>                                                           \
             Method(_STA) /* Used for device presence detection */          \
             {                                                              \
@@ -84 +85 @@
                 }                                                          \
             }                                                              \
+            <NL>                                                           \
             Method(_EJ0, 1)                                                \
             {                                                              \