Changeset 19f857a in mainline for kernel

Timestamp:

2010-03-21T09:39:25Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8023571

Parents:

e2b73d4f

Message:

Rename string.h to str.h to avoid header conflict with standard C string.h.

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• arch/arm32/src/arm32.c (modified) (1 diff)
• arch/ia64/src/drivers/ski.c (modified) (1 diff)
• arch/ia64/src/ia64.c (modified) (1 diff)
• arch/mips32/src/mips32.c (modified) (1 diff)
• arch/ppc32/src/ppc32.c (modified) (1 diff)
• arch/sparc64/src/console.c (modified) (1 diff)
• arch/sparc64/src/drivers/kbd.c (modified) (1 diff)
• arch/sparc64/src/drivers/pci.c (modified) (1 diff)
• arch/sparc64/src/drivers/scr.c (modified) (1 diff)
• arch/sparc64/src/drivers/sgcn.c (modified) (1 diff)
• arch/sparc64/src/smp/sun4v/smp.c (modified) (1 diff)
• arch/sparc64/src/sun4u/sparc64.c (modified) (1 diff)
• arch/sparc64/src/sun4v/md.c (modified) (1 diff)
• arch/sparc64/src/sun4v/sparc64.c (modified) (1 diff)
• genarch/src/drivers/dsrln/dsrlnout.c (modified) (1 diff)
• genarch/src/drivers/ega/ega.c (modified) (1 diff)
• genarch/src/fb/fb.c (modified) (1 diff)
• genarch/src/kbrd/scanc_mac.c (modified) (1 diff)
• genarch/src/kbrd/scanc_pc.c (modified) (1 diff)
• genarch/src/kbrd/scanc_pl050.c (modified) (1 diff)
• genarch/src/kbrd/scanc_sun.c (modified) (1 diff)
• genarch/src/multiboot/multiboot.c (modified) (1 diff)
• genarch/src/ofw/ebus.c (modified) (1 diff)
• genarch/src/ofw/fhc.c (modified) (1 diff)
• genarch/src/ofw/ofw_tree.c (modified) (1 diff)
• genarch/src/ofw/pci.c (modified) (1 diff)
• genarch/src/srln/srln.c (modified) (1 diff)
• generic/include/str.h (moved) (moved from kernel/generic/include/string.h ) (1 diff)
• generic/include/sysinfo/sysinfo.h (modified) (1 diff)
• generic/src/console/cmd.c (modified) (1 diff)
• generic/src/console/console.c (modified) (1 diff)
• generic/src/console/kconsole.c (modified) (2 diffs)
• generic/src/debug/symtab.c (modified) (1 diff)
• generic/src/lib/str.c (moved) (moved from kernel/generic/src/lib/string.c ) (1 diff)
• generic/src/main/kinit.c (modified) (1 diff)
• generic/src/printf/printf_core.c (modified) (1 diff)
• generic/src/printf/vprintf.c (modified) (1 diff)
• generic/src/printf/vsnprintf.c (modified) (1 diff)
• generic/src/proc/task.c (modified) (1 diff)
• generic/src/udebug/udebug_ops.c (modified) (1 diff)

kernel/Makefile

@@ -204 +204 @@
         generic/src/lib/memstr.c \
         generic/src/lib/sort.c \
-        generic/src/lib/string.c \
+        generic/src/lib/str.c \
         generic/src/lib/elf.c \
         generic/src/lib/rd.c \

kernel/arch/arm32/src/arm32.c

@@ -47 +47 @@
 #include <userspace.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <arch/ras.h>
 

kernel/arch/ia64/src/drivers/ski.c

@@ -42 +42 @@
 #include <arch/asm.h>
 #include <arch/drivers/kbd.h>
-#include <string.h>
+#include <str.h>
 #include <arch.h>
 

kernel/arch/ia64/src/ia64.c

@@ -66 +66 @@
 #include <print.h>
 #include <sysinfo/sysinfo.h>
-#include <string.h>
+#include <str.h>
 
 /* NS16550 as a COM 1 */

kernel/arch/mips32/src/mips32.c

@@ -57 +57 @@
 #include <macros.h>
 #include <config.h>
-#include <string.h>
+#include <str.h>
 #include <arch/drivers/msim.h>
 #include <arch/asm/regname.h>

kernel/arch/ppc32/src/ppc32.c

@@ -53 +53 @@
 #include <align.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 

kernel/arch/sparc64/src/console.c

@@ -49 +49 @@
 #include <arch.h>
 #include <panic.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 

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

@@ -43 +43 @@
 #include <arch/types.h>
 #include <align.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 #include <sysinfo/sysinfo.h>

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

@@ -44 +44 @@
 #include <debug.h>
 #include <print.h>
-#include <string.h>
+#include <str.h>
 #include <arch/asm.h>
 #include <sysinfo/sysinfo.h>
 
 #define SABRE_INTERNAL_REG      0
-#define PSYCHO_INTERNAL_REG     2       
+#define PSYCHO_INTERNAL_REG     2
 
 #define OBIO_IMR_BASE   0x200

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

@@ -43 +43 @@
 #include <console/console.h>
 #include <arch/types.h>
-#include <string.h>
+#include <str.h>
 #include <align.h>
 #include <print.h>

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

@@ -40 +40 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <debug.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 #include <mm/page.h>

kernel/arch/sparc64/src/smp/sun4v/smp.c

@@ -53 +53 @@
 #include <time/delay.h>
 #include <arch/smp/sun4v/smp.h>
-#include <string.h>
+#include <str.h>
 
 /** hypervisor code of the "running" state of the CPU */

kernel/arch/sparc64/src/sun4u/sparc64.c

@@ -48 +48 @@
 #include <userspace.h>
 #include <ddi/irq.h>
-#include <string.h>
+#include <str.h>
 
 bootinfo_t bootinfo;

kernel/arch/sparc64/src/sun4v/md.c

@@ -37 +37 @@
 #include <func.h>
 #include <print.h>
-#include <string.h>
+#include <str.h>
 #include <arch/sun4v/md.h>
 #include <arch/sun4v/hypercall.h>

kernel/arch/sparc64/src/sun4v/sparc64.c

@@ -49 +49 @@
 #include <userspace.h>
 #include <ddi/irq.h>
-#include <string.h>
+#include <str.h>
 #include <arch/drivers/niagara.h>
 

kernel/genarch/src/drivers/dsrln/dsrlnout.c

@@ -41 +41 @@
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
-#include <string.h>
+#include <str.h>
 
 typedef struct {

kernel/genarch/src/drivers/ega/ega.c

@@ -45 +45 @@
 #include <arch/asm.h>
 #include <memstr.h>
-#include <string.h>
+#include <str.h>
 #include <console/chardev.h>
 #include <console/console.h>

kernel/genarch/src/fb/fb.c

@@ -49 +49 @@
 #include <bitops.h>
 #include <print.h>
-#include <string.h>
+#include <str.h>
 #include <ddi/ddi.h>
 #include <arch/types.h>

kernel/genarch/src/kbrd/scanc_mac.c

@@ -37 +37 @@
 #include <genarch/kbrd/scanc.h>
 #include <typedefs.h>
-#include <string.h>
+#include <str.h>
 
 /** Primary meaning of scancodes. */

kernel/genarch/src/kbrd/scanc_pc.c

@@ -37 +37 @@
 #include <genarch/kbrd/scanc.h>
 #include <typedefs.h>
-#include <string.h>
+#include <str.h>
 
 /** Primary meaning of scancodes. */

kernel/genarch/src/kbrd/scanc_pl050.c

@@ -36 +36 @@
 #include <genarch/kbrd/scanc.h>
 #include <typedefs.h>
-#include <string.h>
+#include <str.h>
 
 

kernel/genarch/src/kbrd/scanc_sun.c

@@ -37 +37 @@
 #include <genarch/kbrd/scanc.h>
 #include <typedefs.h>
-#include <string.h>
+#include <str.h>
 
 /** Primary meaning of scancodes. */

kernel/genarch/src/multiboot/multiboot.c

@@ -37 +37 @@
 #include <typedefs.h>
 #include <config.h>
-#include <string.h>
+#include <str.h>
 #include <macros.h>
 

kernel/genarch/src/ofw/ebus.c

@@ -40 +40 @@
 #include <genarch/ofw/pci.h>
 #include <arch/memstr.h>
-#include <string.h>
+#include <str.h>
 #include <panic.h>
 #include <debug.h>

kernel/genarch/src/ofw/fhc.c

@@ -40 +40 @@
 #include <arch/drivers/fhc.h>
 #include <arch/memstr.h>
-#include <string.h>
+#include <str.h>
 #include <panic.h>
 #include <macros.h>

kernel/genarch/src/ofw/ofw_tree.c

@@ -39 +39 @@
 #include <arch/memstr.h>
 #include <mm/slab.h>
-#include <string.h>
+#include <str.h>
 #include <panic.h>
 #include <print.h>

kernel/genarch/src/ofw/pci.c

@@ -41 +41 @@
 #include <arch/trap/interrupt.h>
 #include <arch/memstr.h>
-#include <string.h>
+#include <str.h>
 #include <panic.h>
 #include <macros.h>
 
 #define PCI_SPACE_MASK          0x03000000
-#define PCI_ABS_MASK            0x80000000      
+#define PCI_ABS_MASK            0x80000000
 #define PCI_REG_MASK            0x000000ff
 

kernel/genarch/src/srln/srln.c

@@ -40 +40 @@
 #include <proc/thread.h>
 #include <arch.h>
-#include <string.h>
+#include <str.h>
 
 static indev_operations_t srln_raw_ops = {

kernel/generic/include/str.h

@@ -33 +33 @@
  */
 
-#ifndef KERN_STRING_H_
-#define KERN_STRING_H_
+#ifndef KERN_STR_H_
+#define KERN_STR_H_
 
 #include <typedefs.h>

kernel/generic/include/sysinfo/sysinfo.h

@@ -37 +37 @@
 
 #include <arch/types.h>
-#include <string.h>
+#include <str.h>
 
 extern bool fb_exported;

kernel/generic/src/console/cmd.c

@@ -51 +51 @@
 #include <config.h>
 #include <func.h>
-#include <string.h>
+#include <str.h>
 #include <macros.h>
 #include <debug.h>

kernel/generic/src/console/console.c

@@ -51 +51 @@
 #include <syscall/copy.h>
 #include <errno.h>
-#include <string.h>
+#include <str.h>
 
 #define KLOG_PAGES    4

kernel/generic/src/console/kconsole.c

@@ -51 +51 @@
 #include <debug.h>
 #include <func.h>
-#include <string.h>
+#include <str.h>
 #include <macros.h>
 #include <sysinfo/sysinfo.h>
@@ -58 +58 @@
 #include <errno.h>
 #include <putchar.h>
-#include <string.h>
+#include <str.h>
 
 /** Simple kernel console.

kernel/generic/src/debug/symtab.c

@@ -38 +38 @@
 #include <symtab.h>
 #include <byteorder.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 #include <arch/types.h>

kernel/generic/src/lib/str.c

@@ -102 +102 @@
  */
 
-#include <string.h>
+#include <str.h>
 #include <print.h>
 #include <cpu.h>

kernel/generic/src/main/kinit.c

@@ -66 +66 @@
 #include <ipc/ipc.h>
 #include <debug.h>
-#include <string.h>
+#include <str.h>
 
 #ifdef CONFIG_SMP

kernel/generic/src/printf/printf_core.c

@@ -41 +41 @@
 #include <stdarg.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <arch.h>
 

kernel/generic/src/printf/vprintf.c

@@ -40 +40 @@
 #include <arch/types.h>
 #include <typedefs.h>
-#include <string.h>
+#include <str.h>
 
 SPINLOCK_STATIC_INITIALIZE_NAME(printf_lock, "*printf_lock");

kernel/generic/src/printf/vsnprintf.c

@@ -35 +35 @@
 #include <print.h>
 #include <printf/printf_core.h>
-#include <string.h>
+#include <str.h>
 #include <memstr.h>
 #include <errno.h>

kernel/generic/src/proc/task.c

@@ -53 +53 @@
 #include <errno.h>
 #include <func.h>
-#include <string.h>
+#include <str.h>
 #include <memstr.h>
 #include <syscall/copy.h>

kernel/generic/src/udebug/udebug_ops.c

@@ -46 +46 @@
 #include <errno.h>
 #include <print.h>
-#include <string.h>
+#include <str.h>
 #include <syscall/copy.h>
 #include <ipc/ipc.h>