Changeset 96b02eb9 in mainline for kernel/genarch/src

Timestamp:

2010-12-14T12:52:38Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6b10dab

Parents:

554debd

Message:

more unification of basic types

• use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
• remove ipcarg_t in favour of sysarg_t

(no change in functionality)

Location:

kernel/genarch/src

Files:

• acpi/acpi.c (modified) (1 diff)
• acpi/madt.c (modified) (2 diffs)
• mm/page_ht.c (modified) (7 diffs)

kernel/genarch/src/acpi/acpi.c

@@ -116 +116 @@
                     / sizeof(struct acpi_signature_map); j++) {
                         struct acpi_sdt_header *hdr =
-                            (struct acpi_sdt_header *) (unative_t) acpi_rsdt->entry[i];
+                            (struct acpi_sdt_header *) (sysarg_t) acpi_rsdt->entry[i];
                         
                         map_sdt(hdr);

kernel/genarch/src/acpi/madt.c

@@ -165 +165 @@
                 /* Remember index of the first io apic entry */
                 madt_io_apic_entry_index = i;
-                io_apic = (uint32_t *) (unative_t) ioa->io_apic_address;
+                io_apic = (uint32_t *) (sysarg_t) ioa->io_apic_address;
         } else {
                 /* Currently not supported */
@@ -190 +190 @@
         struct madt_apic_header *hdr;
         
-        l_apic = (uint32_t *) (unative_t) acpi_madt->l_apic_address;
+        l_apic = (uint32_t *) (sysarg_t) acpi_madt->l_apic_address;
         
         /* Count MADT entries */

kernel/genarch/src/mm/page_ht.c

@@ -52 +52 @@
 #include <align.h>
 
-static size_t hash(unative_t[]);
-static bool compare(unative_t[], size_t, link_t *);
+static size_t hash(sysarg_t[]);
+static bool compare(sysarg_t[], size_t, link_t *);
 static void remove_callback(link_t *);
 
@@ -96 +96 @@
  *
  */
-size_t hash(unative_t key[])
+size_t hash(sysarg_t key[])
 {
         as_t *as = (as_t *) key[KEY_AS];
@@ -115 +115 @@
          *
          */
-        index |= ((unative_t) as) & (PAGE_HT_ENTRIES - 1);
+        index |= ((sysarg_t) as) & (PAGE_HT_ENTRIES - 1);
         
         return index;
@@ -129 +129 @@
  *
  */
-bool compare(unative_t key[], size_t keys, link_t *item)
+bool compare(sysarg_t key[], size_t keys, link_t *item)
 {
         ASSERT(item);
@@ -180 +180 @@
     unsigned int flags)
 {
-        unative_t key[2] = {
+        sysarg_t key[2] = {
                 (uintptr_t) as,
                 page = ALIGN_DOWN(page, PAGE_SIZE)
@@ -220 +220 @@
 void ht_mapping_remove(as_t *as, uintptr_t page)
 {
-        unative_t key[2] = {
+        sysarg_t key[2] = {
                 (uintptr_t) as,
                 page = ALIGN_DOWN(page, PAGE_SIZE)
@@ -247 +247 @@
 pte_t *ht_mapping_find(as_t *as, uintptr_t page)
 {
-        unative_t key[2] = {
+        sysarg_t key[2] = {
                 (uintptr_t) as,
                 page = ALIGN_DOWN(page, PAGE_SIZE)