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

Timestamp:

2009-04-03T08:02:30Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2398ee9

Parents:

9be1d58

Message:

update for string changes

Location:

kernel/arch/sparc64/src

Files:

• console.c (modified) (1 diff)
• drivers/kbd.c (modified) (1 diff)
• drivers/pci.c (modified) (3 diffs)
• drivers/scr.c (modified) (1 diff)
• drivers/sgcn.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• sparc64.c (modified) (1 diff)

kernel/arch/sparc64/src/console.c

@@ -119 +119 @@
         prop = ofw_tree_getprop(aliases, "def-cn");
         
-        if ((!prop) || (!prop->value) || (strcmp(prop->value, "/sgcn") != 0)) {
+        if ((!prop) || (!prop->value) || (str_cmp(prop->value, "/sgcn") != 0)) {
                 standard_console_init(aliases);
         } else {

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

@@ -87 +87 @@
          * Determine keyboard serial controller type.
          */
-        if (strcmp(name, "zs") == 0)
+        if (str_cmp(name, "zs") == 0)
                 kbd_type = KBD_Z8530;
-        else if (strcmp(name, "su") == 0)
+        else if (str_cmp(name, "su") == 0)
                 kbd_type = KBD_NS16550;
         

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

@@ -184 +184 @@
          * First, verify this is a PCI node.
          */
-        ASSERT(strcmp(ofw_tree_node_name(node), "pci") == 0);
+        ASSERT(str_cmp(ofw_tree_node_name(node), "pci") == 0);
 
         /*
@@ -193 +193 @@
                 return NULL;
         
-        if (strcmp(prop->value, "SUNW,sabre") == 0) {
+        if (str_cmp(prop->value, "SUNW,sabre") == 0) {
                 /*
                  * PCI controller Sabre.
@@ -199 +199 @@
                  */
                 return pci_sabre_init(node);
-        } else if (strcmp(prop->value, "SUNW,psycho") == 0) {
+        } else if (str_cmp(prop->value, "SUNW,psycho") == 0) {
                 /*
                  * PCI controller Psycho.

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

@@ -64 +64 @@
         name = ofw_tree_node_name(node);
         
-        if (strcmp(name, "SUNW,m64B") == 0)
+        if (str_cmp(name, "SUNW,m64B") == 0)
                 scr_type = SCR_ATYFB;
-        else if (strcmp(name, "SUNW,XVR-100") == 0)
+        else if (str_cmp(name, "SUNW,XVR-100") == 0)
                 scr_type = SCR_XVR;
-        else if (strcmp(name, "SUNW,ffb") == 0)
+        else if (str_cmp(name, "SUNW,ffb") == 0)
                 scr_type = SCR_FFB;
-        else if (strcmp(name, "cgsix") == 0)
+        else if (str_cmp(name, "cgsix") == 0)
                 scr_type = SCR_CGSIX;
         

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

@@ -208 +208 @@
         init_sram_begin();
                 
-        ASSERT(strcmp(SRAM_TOC->magic, SRAM_TOC_MAGIC) == 0);
+        ASSERT(str_cmp(SRAM_TOC->magic, SRAM_TOC_MAGIC) == 0);
         
         /* lookup TOC entry with the correct key */
         uint32_t i;
         for (i = 0; i < MAX_TOC_ENTRIES; i++) {
-                if (strcmp(SRAM_TOC->keys[i].key, CONSOLE_KEY) == 0)
+                if (str_cmp(SRAM_TOC->keys[i].key, CONSOLE_KEY) == 0)
                         break;
         }

kernel/arch/sparc64/src/mm/page.c

@@ -63 +63 @@
 uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
-        return PA2KA(physaddr);
+        if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
+                panic("Unable to map physical memory %p (%d bytes).", physaddr, size)
+        
+        uintptr_t virtaddr = PA2KA(last_frame);
+        pfn_t i;
+        for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++) {
+                uintptr_t addr = PFN2ADDR(i);
+                page_mapping_insert(AS_KERNEL, virtaddr + addr, physaddr + addr, PAGE_NOT_CACHEABLE | PAGE_WRITE);
+        }
+        
+        last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
+        
+        return virtaddr;
 }
 

kernel/arch/sparc64/src/sparc64.c

@@ -62 +62 @@
                 init.tasks[i].addr = (uintptr_t) bootinfo.taskmap.tasks[i].addr;
                 init.tasks[i].size = bootinfo.taskmap.tasks[i].size;
-                strncpy(init.tasks[i].name, bootinfo.taskmap.tasks[i].name,
+                str_ncpy(init.tasks[i].name, bootinfo.taskmap.tasks[i].name,
                         CONFIG_TASK_NAME_BUFLEN);
         }