WebSVN – HelenOS – Path Comparison – / – /branches/network/kernel/genarch Rev 3240 and /branches/network/kernel/genarch Rev 3386

Ignore whitespace Rev 3240 → Rev 3386

 /branches/network/kernel/genarch/include/mm/page_pt.h
 ,9 → 116,7
 #define PTE_WRITABLE(p)     PTE_WRITABLE_ARCH((p))
 #define PTE_EXECUTABLE(p)   PTE_EXECUTABLE_ARCH((p))
-#ifndef __OBJC__
 extern as_operations_t as_pt_operations;
-#endif
 extern page_mapping_operations_t pt_mapping_operations;
 extern void page_mapping_insert_pt(as_t *as, uintptr_t page, uintptr_t frame,

/branches/network/kernel/genarch/include/ofw/ofw_tree.h
30,6 → 30,7
#define KERN_OFW_TREE_H_

#include <arch/types.h>
#include <typedefs.h>

#define OFW_TREE_PROPERTY_MAX_NAMELEN 32

 /branches/network/kernel/genarch/src/mm/as_pt.c
 ,31 → 52,6
 static void pt_lock(as_t *as, bool lock);
 static void pt_unlock(as_t *as, bool unlock);
-#ifdef __OBJC__
-@implementation as_t
-+ (pte_t *) page_table_create: (int) flags
-{
-    return ptl0_create(flags);
-}
-+ (void) page_table_destroy: (pte_t *) page_table
-{
-    ptl0_destroy(page_table);
-}
-- (void) page_table_lock: (bool) _lock
-{
-    pt_lock(self, _lock);
-}
-- (void) page_table_unlock: (bool) unlock
-{
-    pt_unlock(self, unlock);
-}
-@end
-#else
 as_operations_t as_pt_operations = {
     .page_table_create = ptl0_create,
     .page_table_destroy = ptl0_destroy,
 ,7 → 58,6
     .page_table_lock = pt_lock,
     .page_table_unlock = pt_unlock
 };
-#endif
 /** Create PTL0.
  *
 ,7 → 77,7
     table_size = FRAME_SIZE << PTL0_SIZE;
     if (flags & FLAG_AS_KERNEL) {
-        memsetb((uintptr_t) dst_ptl0, table_size, 0);
+        memsetb(dst_ptl0, table_size, 0);
     } else {
         uintptr_t src, dst;
 ,7 → 92,7
         src = (uintptr_t) &src_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
         dst = (uintptr_t) &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
-        memsetb((uintptr_t) dst_ptl0, table_size, 0);
+        memsetb(dst_ptl0, table_size, 0);
         memcpy((void *) dst, (void *) src, table_size - (src - (uintptr_t) src_ptl0));
         mutex_unlock(&AS_KERNEL->lock);
         interrupts_restore(ipl);

 /branches/network/kernel/genarch/src/mm/as_ht.c
 ,7 → 72,7
 {
     if (flags & FLAG_AS_KERNEL) {
         hash_table_create(&page_ht, PAGE_HT_ENTRIES, 2, &ht_operations);
-        mutex_initialize(&page_ht_lock);
+        mutex_initialize(&page_ht_lock, MUTEX_PASSIVE);
     }
     return NULL;
 }

 /branches/network/kernel/genarch/src/mm/page_pt.c
 ,7 → 76,7
     if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
         newpt = (pte_t *)frame_alloc(PTL1_SIZE, FRAME_KA);
-        memsetb((uintptr_t)newpt, FRAME_SIZE << PTL1_SIZE, 0);
+        memsetb(newpt, FRAME_SIZE << PTL1_SIZE, 0);
         SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
         SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE | PAGE_WRITE);
     }
 ,7 → 85,7
     if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
         newpt = (pte_t *)frame_alloc(PTL2_SIZE, FRAME_KA);
-        memsetb((uintptr_t)newpt, FRAME_SIZE << PTL2_SIZE, 0);
+        memsetb(newpt, FRAME_SIZE << PTL2_SIZE, 0);
         SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
         SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE | PAGE_WRITE);
     }
 ,7 → 94,7
     if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
         newpt = (pte_t *)frame_alloc(PTL3_SIZE, FRAME_KA);
-        memsetb((uintptr_t)newpt, FRAME_SIZE << PTL3_SIZE, 0);
+        memsetb(newpt, FRAME_SIZE << PTL3_SIZE, 0);
         SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
         SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE | PAGE_WRITE);
     }
 ,7 → 146,7
     ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
     /* Destroy the mapping. Setting to PAGE_NOT_PRESENT is not sufficient. */
-    memsetb((uintptr_t) &ptl3[PTL3_INDEX(page)], sizeof(pte_t), 0);
+    memsetb(&ptl3[PTL3_INDEX(page)], sizeof(pte_t), 0);
     /*
      * Second, free all empty tables along the way from PTL3 down to PTL0.
 ,11 → 166,11
          */
         frame_free(KA2PA((uintptr_t) ptl3));
         if (PTL2_ENTRIES)
-            memsetb((uintptr_t) &ptl2[PTL2_INDEX(page)], sizeof(pte_t), 0);
+            memsetb(&ptl2[PTL2_INDEX(page)], sizeof(pte_t), 0);
         else if (PTL1_ENTRIES)
-            memsetb((uintptr_t) &ptl1[PTL1_INDEX(page)], sizeof(pte_t), 0);
+            memsetb(&ptl1[PTL1_INDEX(page)], sizeof(pte_t), 0);
         else
-            memsetb((uintptr_t) &ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
+            memsetb(&ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
     } else {
         /*
          * PTL3 is not empty.
 ,9 → 195,9
              */
             frame_free(KA2PA((uintptr_t) ptl2));
             if (PTL1_ENTRIES)
-                memsetb((uintptr_t) &ptl1[PTL1_INDEX(page)], sizeof(pte_t), 0);
+                memsetb(&ptl1[PTL1_INDEX(page)], sizeof(pte_t), 0);
             else
-                memsetb((uintptr_t) &ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
+                memsetb(&ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
         }
         else {
             /*
 ,7 → 223,7
              * Release the frame and remove PTL1 pointer from preceding table.
              */
             frame_free(KA2PA((uintptr_t) ptl1));
-            memsetb((uintptr_t) &ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
+            memsetb(&ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
         }
     }

 /branches/network/kernel/genarch/src/acpi/madt.c
 ,7 → 126,7
 int madt_irq_to_pin(unsigned int irq)
 {
-    ASSERT(irq < sizeof(isa_irq_map)/sizeof(int));
+    ASSERT(irq < sizeof(isa_irq_map) / sizeof(int));
         return isa_irq_map[irq];
 }
 ,15 → 184,15
                 case MADT_IO_SAPIC:
                 case MADT_L_SAPIC:
                 case MADT_PLATFORM_INTR_SRC:
-                    printf("MADT: skipping %s entry (type=%zd)\n", entry[h->type], h->type);
+                    printf("MADT: skipping %s entry (type=%" PRIu8 ")\n", entry[h->type], h->type);
                     break;
                 default:
                     if (h->type >= MADT_RESERVED_SKIP_BEGIN && h->type <= MADT_RESERVED_SKIP_END) {
-                        printf("MADT: skipping reserved entry (type=%zd)\n", h->type);
+                        printf("MADT: skipping reserved entry (type=%" PRIu8 ")\n", h->type);
                     }
                     if (h->type >= MADT_RESERVED_OEM_BEGIN) {
-                        printf("MADT: skipping OEM entry (type=%zd)\n", h->type);
+                        printf("MADT: skipping OEM entry (type=%" PRIu8 ")\n", h->type);
                     }
                     break;
             }
 ,8 → 233,8
 void madt_intr_src_ovrd_entry(struct madt_intr_src_ovrd *override, uint32_t index)
 {
-    ASSERT(override->source < sizeof(isa_irq_map)/sizeof(int));
-    printf("MADT: ignoring %s entry: bus=%zd, source=%zd, global_int=%zd, flags=%#hx\n",
+    ASSERT(override->source < sizeof(isa_irq_map) / sizeof(int));
+    printf("MADT: ignoring %s entry: bus=%" PRIu8 ", source=%" PRIu8 ", global_int=%" PRIu32 ", flags=%#" PRIx16 "\n",
         entry[override->header.type], override->bus, override->source,
         override->global_int, override->flags);
 }

 /branches/network/kernel/genarch/src/acpi/acpi.c
 ,7 → 105,7
                 if (!acpi_sdt_check((uint8_t *) h))
                     goto next;
                 *signature_map[j].sdt_ptr = h;
-                printf("%#zp: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                printf("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
             }
         }
 next:
 ,7 → 126,7
                 if (!acpi_sdt_check((uint8_t *) h))
                     goto next;
                 *signature_map[j].sdt_ptr = h;
-                printf("%#zp: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                printf("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
             }
         }
 next:
 ,7 → 160,7
     return;
 rsdp_found:
-    printf("%#zp: ACPI Root System Description Pointer\n", acpi_rsdp);
+    printf("%p: ACPI Root System Description Pointer\n", acpi_rsdp);
     acpi_rsdt = (struct acpi_rsdt *) (unative_t) acpi_rsdp->rsdt_address;
     if (acpi_rsdp->revision) acpi_xsdt = (struct acpi_xsdt *) ((uintptr_t) acpi_rsdp->xsdt_address);
 ,11 → 169,11
     if (acpi_xsdt) map_sdt((struct acpi_sdt_header *) acpi_xsdt);
     if (acpi_rsdt && !acpi_sdt_check((uint8_t *) acpi_rsdt)) {
-        printf("RSDT: %s\n", "bad checksum");
+        printf("RSDT: bad checksum\n");
         return;
     }
     if (acpi_xsdt && !acpi_sdt_check((uint8_t *) acpi_xsdt)) {
-        printf("XSDT: %s\n", "bad checksum");
+        printf("XSDT: bad checksum\n");
         return;
     }

 /branches/network/kernel/genarch/src/ofw/ebus.c
 ,7 → 57,7
     ranges = prop->size / sizeof(ofw_ebus_range_t);
     range = prop->value;
-    int i;
+    unsigned int i;
     for (i = 0; i < ranges; i++) {
         if (reg->space != range[i].child_space)
 ,7 → 102,7
     uint32_t addr = reg->addr & intr_mask->addr_mask;
     uint32_t intr = interrupt & intr_mask->intr_mask;
-    int i;
+    unsigned int i;
     for (i = 0; i < count; i++) {
         if ((intr_map[i].space == space) && (intr_map[i].addr == addr)
             && (intr_map[i].intr == intr))

 /branches/network/kernel/genarch/src/ofw/fhc.c
 ,7 → 55,7
     ranges = prop->size / sizeof(ofw_fhc_range_t);
     range = prop->value;
-    int i;
+    unsigned int i;
     for (i = 0; i < ranges; i++) {
         if (overlaps(reg->addr, reg->size, range[i].child_base, range[i].size)) {
 ,7 → 97,7
     ranges = prop->size / sizeof(ofw_central_range_t);
     range = prop->value;
-    int i;
+    unsigned int i;
     for (i = 0; i < ranges; i++) {
         if (overlaps(reg->addr, reg->size, range[i].child_base, range[i].size)) {

 /branches/network/kernel/genarch/src/ofw/ofw_tree.c
 ,7 → 61,7
  */
 ofw_tree_property_t *ofw_tree_getprop(const ofw_tree_node_t *node, const char *name)
 {
-    int i;
+    unsigned int i;
     for (i = 0; i < node->properties; i++) {
         if (strcmp(node->property[i].name, name) == 0)

 /branches/network/kernel/genarch/src/ofw/pci.c
 ,7 → 65,7
     ranges = prop->size / sizeof(ofw_pci_range_t);
     range = prop->value;
-    int i;
+    unsigned int i;
     for (i = 0; i < ranges; i++) {
         if ((reg->space & PCI_SPACE_MASK) != (range[i].space & PCI_SPACE_MASK))
 ,7 → 100,7
     assigned_addresses = prop->size / sizeof(ofw_pci_reg_t);
     assigned_address = prop->value;
-    int i;
+    unsigned int i;
     for (i = 0; i < assigned_addresses; i++) {
         if ((assigned_address[i].space & PCI_REG_MASK) == (reg->space & PCI_REG_MASK)) {

 /branches/network/kernel/genarch/src/ofw/sbus.c
 ,7 → 61,7
     ranges = prop->size / sizeof(ofw_sbus_range_t);
     range = prop->value;
-    int i;
+    unsigned int i;
     for (i = 0; i < ranges; i++) {
         if (overlaps(reg->addr, reg->size, range[i].child_base,

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3240 → Rev 3386