Changeset e16e036a in mainline for genarch/src

Timestamp:

2005-11-07T20:04:30Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c4e8ed9d

Parents:

d90ca68

Message:

major build system revision (unfinished)
this patchset most definitively breaks a lot of things, be patient

Location:

genarch/src/acpi

Files:

• acpi.c (moved) (moved from genarch/src/firmware/acpi/acpi.c ) (4 diffs)
• matd.c (moved) (moved from genarch/src/firmware/acpi/madt.c ) (1 diff)

genarch/src/acpi/acpi.c

@@ -27 +27 @@
  */
 
-#include <genarch/firmware/acpi/acpi.h>
-#include <genarch/firmware/acpi/madt.h>
+#include <genarch/acpi/acpi.h>
+#include <genarch/acpi/madt.h>
 #include <arch/bios/bios.h>
 
@@ -45 +45 @@
 };
 
-int rsdp_check(__u8 *rsdp) {
+static int rsdp_check(__u8 *rsdp) {
         struct acpi_rsdp *r = (struct acpi_rsdp *) rsdp;
         __u8 sum = 0;
@@ -78 +78 @@
 }
 
-void map_sdt(struct acpi_sdt_header *sdt)
+static void map_sdt(struct acpi_sdt_header *sdt)
 {
         map_page_to_frame((__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
         map_structure((__address) sdt, sdt->length);
+}
+
+static void configure_via_rsdt(void)
+{
+        int i, j, cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header))/sizeof(__u32);
+        
+        for (i=0; i<cnt; i++) {
+                for (j=0; j<sizeof(signature_map)/sizeof(struct acpi_signature_map); j++) {
+                        struct acpi_sdt_header *h = (struct acpi_sdt_header *) (__native) acpi_rsdt->entry[i];
+                
+                        map_sdt(h);     
+                        if (*((__u32 *) &h->signature[0])==*((__u32 *) &signature_map[j].signature[0])) {
+                                if (!acpi_sdt_check((__u8 *) h))
+                                        goto next;
+                                *signature_map[j].sdt_ptr = h;
+                                printf("%P: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                        }
+                }
+next:
+                ;
+        }
+}
+
+static void configure_via_xsdt(void)
+{
+        int i, j, cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header))/sizeof(__u64);
+        
+        for (i=0; i<cnt; i++) {
+                for (j=0; j<sizeof(signature_map)/sizeof(struct acpi_signature_map); j++) {
+                        struct acpi_sdt_header *h = (struct acpi_sdt_header *) ((__address) acpi_rsdt->entry[i]);
+
+                        map_sdt(h);
+                        if (*((__u32 *) &h->signature[0])==*((__u32 *) &signature_map[j].signature[0])) {
+                                if (!acpi_sdt_check((__u8 *) h))
+                                        goto next;
+                                *signature_map[j].sdt_ptr = h;
+                                printf("%P: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                        }
+                }
+next:
+                ;
+        }
+
 }
 
@@ -131 +174 @@
 }
 
-void configure_via_rsdt(void)
-{
-        int i, j, cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header))/sizeof(__u32);
-        
-        for (i=0; i<cnt; i++) {
-                for (j=0; j<sizeof(signature_map)/sizeof(struct acpi_signature_map); j++) {
-                        struct acpi_sdt_header *h = (struct acpi_sdt_header *) (__native) acpi_rsdt->entry[i];
-                
-                        map_sdt(h);     
-                        if (*((__u32 *) &h->signature[0])==*((__u32 *) &signature_map[j].signature[0])) {
-                                if (!acpi_sdt_check((__u8 *) h))
-                                        goto next;
-                                *signature_map[j].sdt_ptr = h;
-                                printf("%P: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
-                        }
-                }
-next:
-                ;
-        }
-}
-
-void configure_via_xsdt(void)
-{
-        int i, j, cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header))/sizeof(__u64);
-        
-        for (i=0; i<cnt; i++) {
-                for (j=0; j<sizeof(signature_map)/sizeof(struct acpi_signature_map); j++) {
-                        struct acpi_sdt_header *h = (struct acpi_sdt_header *) ((__address) acpi_rsdt->entry[i]);
-
-                        map_sdt(h);
-                        if (*((__u32 *) &h->signature[0])==*((__u32 *) &signature_map[j].signature[0])) {
-                                if (!acpi_sdt_check((__u8 *) h))
-                                        goto next;
-                                *signature_map[j].sdt_ptr = h;
-                                printf("%P: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
-                        }
-                }
-next:
-                ;
-        }
-
-}

genarch/src/acpi/matd.c

@@ -29 +29 @@
 #include <arch/types.h>
 #include <typedefs.h>
-#include <genarch/firmware/acpi/acpi.h>
-#include <genarch/firmware/acpi/madt.h>
+#include <genarch/acpi/acpi.h>
+#include <genarch/acpi/madt.h>
 #include <arch/smp/apic.h>
 #include <arch/smp/smp.h>