Changeset bd48f4c in mainline for kernel/genarch/include

Timestamp:

2010-07-12T10:53:30Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/genarch/include/acpi

Files:

• acpi.h (modified) (4 diffs)
• madt.h (modified) (6 diffs)

kernel/genarch/include/acpi/acpi.h

@@ -27 +27 @@
  */
 
-/** @addtogroup genarch 
+/** @addtogroup genarch
  * @{
  */
@@ -62 +62 @@
         uint32_t creator_id;
         uint32_t creator_revision;
-} __attribute__ ((packed));;
+} __attribute__ ((packed));
 
 struct acpi_signature_map {
@@ -74 +74 @@
         struct acpi_sdt_header header;
         uint32_t entry[];
-} __attribute__ ((packed));;
+} __attribute__ ((packed));
 
 /* Extended System Description Table */
@@ -80 +80 @@
         struct acpi_sdt_header header;
         uint64_t entry[];
-} __attribute__ ((packed));;
+} __attribute__ ((packed));
 
 extern struct acpi_rsdp *acpi_rsdp;

kernel/genarch/include/acpi/madt.h

@@ -27 +27 @@
  */
 
-/** @addtogroup genarch 
+/** @addtogroup genarch
  * @{
  */
@@ -40 +40 @@
 #include <arch/smp/smp.h>
 
-#define MADT_L_APIC                     0
-#define MADT_IO_APIC                    1
-#define MADT_INTR_SRC_OVRD              2
-#define MADT_NMI_SRC                    3
-#define MADT_L_APIC_NMI                 4
-#define MADT_L_APIC_ADDR_OVRD           5
-#define MADT_IO_SAPIC                   6
-#define MADT_L_SAPIC                    7
-#define MADT_PLATFORM_INTR_SRC          8
-#define MADT_RESERVED_SKIP_BEGIN        9
-#define MADT_RESERVED_SKIP_END          127
-#define MADT_RESERVED_OEM_BEGIN         128
+#define MADT_L_APIC               0
+#define MADT_IO_APIC              1
+#define MADT_INTR_SRC_OVRD        2
+#define MADT_NMI_SRC              3
+#define MADT_L_APIC_NMI           4
+#define MADT_L_APIC_ADDR_OVRD     5
+#define MADT_IO_SAPIC             6
+#define MADT_L_SAPIC              7
+#define MADT_PLATFORM_INTR_SRC    8
+#define MADT_RESERVED_SKIP_BEGIN  9
+#define MADT_RESERVED_SKIP_END    127
+#define MADT_RESERVED_OEM_BEGIN   128
 
 struct madt_apic_header {
@@ -57 +57 @@
         uint8_t length;
 } __attribute__ ((packed));
-
 
 /* Multiple APIC Description Table */
@@ -71 +70 @@
         uint8_t acpi_id;
         uint8_t apic_id;
-        uint32_t flags; 
+        uint32_t flags;
 } __attribute__ ((packed));
 
@@ -78 +77 @@
         uint8_t io_apic_id;
         uint8_t reserved;
-        uint32_t io_apic_address;       
+        uint32_t io_apic_address;
         uint32_t global_intr_base;
 } __attribute__ ((packed));
@@ -114 +113 @@
         uint8_t reserved;
         uint32_t global_intr_base;
-        uint64_t io_apic_address;               
+        uint64_t io_apic_address;
 } __attribute__ ((packed));