Changeset adec5b45 in mainline for kernel/arch/sparc64/src

Timestamp:

2012-01-27T22:19:12Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1ccd0aa

Parents:

d4673296

Message:

Rename hw_map() to km_map() and add protection flags argument
to make it more generic.

Location:

kernel/arch/sparc64/src/drivers

Files:

• kbd.c (modified) (1 diff)
• pci.c (modified) (2 diffs)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -114 +114 @@
         size_t offset = pa - aligned_addr;
         
-        ns16550_t *ns16550 = (ns16550_t *)
-           (hw_map(aligned_addr, offset + size) + offset);
+        ns16550_t *ns16550 = (ns16550_t *) (km_map(aligned_addr, offset + size,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset);
         
         ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, inr, cir, cir_arg);

kernel/arch/sparc64/src/drivers/pci.c

@@ -109 +109 @@
         pci->model = PCI_SABRE;
         pci->op = &pci_sabre_ops;
-        pci->reg = (uint64_t *) hw_map(paddr, reg[SABRE_INTERNAL_REG].size);
+        pci->reg = (uint64_t *) km_map(paddr, reg[SABRE_INTERNAL_REG].size,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
 
         /*
@@ -156 +157 @@
         pci->model = PCI_PSYCHO;
         pci->op = &pci_psycho_ops;
-        pci->reg = (uint64_t *) hw_map(paddr, reg[PSYCHO_INTERNAL_REG].size);
+        pci->reg = (uint64_t *) km_map(paddr, reg[PSYCHO_INTERNAL_REG].size,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
 
         /*