[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[XenPPC] [pushed] [ppc] styling with the homies



changeset:   9963:29e803e524c2d47b8fca1ea9095f4295e1ce2ccb
tag:         tip
user:        jimix@xxxxxxxxxxxxxxxxxxxxx
date:        Thu May  4 08:57:37 2006 -0400
files:       xen/arch/ppc/boot_of.c xen/arch/ppc/exceptions.c 
xen/arch/ppc/mpic.c xen/arch/ppc/ppc64/hypercall_table.S 
xen/arch/ppc/ppc64/ppc970.c
description:
[ppc] styling with the homies
 - avoid '//' for coments
 - one state per line
 - no commenting of code, meaningful ifdefs


diff -r 445048da835fa0418f2ad04b0483f86cc6531104 -r 
29e803e524c2d47b8fca1ea9095f4295e1ce2ccb xen/arch/ppc/boot_of.c
--- a/xen/arch/ppc/boot_of.c    Thu May  4 08:55:46 2006 -0400
+++ b/xen/arch/ppc/boot_of.c    Thu May  4 08:57:37 2006 -0400
@@ -403,16 +403,20 @@ static void boot_of_probemem(multiboot_i
                 al = ah = ll = lh = 0;
                 if (addr_cells == 2) {
                     ah = reg[r++];
-                    if (r >= l) break;  // partial line.  Skip
+                    if (r >= l)
+                        break;  /* partial line.  Skip  */
                     al = reg[r++];
-                    if (r >= l) break;  // partial line.  Skip
+                    if (r >= l)
+                        break;  /* partial line.  Skip */
                 } else {
                     al = reg[r++];
-                    if (r >= l) break;  // partial line.  Skip
+                    if (r >= l)
+                        break;  /* partial line.  Skip */
                 }
                 if (size_cells == 2) {
                     lh = reg[r++];
-                    if (r >= l) break;  // partial line.  Skip
+                    if (r >= l)
+                        break;  /* partial line.  Skip */
                     ll = reg[r++];
                 } else {
                     ll = reg[r++];
diff -r 445048da835fa0418f2ad04b0483f86cc6531104 -r 
29e803e524c2d47b8fca1ea9095f4295e1ce2ccb xen/arch/ppc/exceptions.c
--- a/xen/arch/ppc/exceptions.c Thu May  4 08:55:46 2006 -0400
+++ b/xen/arch/ppc/exceptions.c Thu May  4 08:57:37 2006 -0400
@@ -53,7 +53,6 @@ void do_timer(struct cpu_user_regs *regs
         } else {
             d = get_current()->domain->domain_id;
         }
-//        printk("HH: %d: pc: 0x%lx lr: 0x%lx \n", d, regs->pc, regs->lr);
         extern char serial_getc_nb(int handle);
         if (0 && serial_getc_nb(0) > 0) {
             printk("H: pc: 0x%lx lr: 0x%lx \n", regs->pc, regs->lr);
diff -r 445048da835fa0418f2ad04b0483f86cc6531104 -r 
29e803e524c2d47b8fca1ea9095f4295e1ce2ccb xen/arch/ppc/mpic.c
--- a/xen/arch/ppc/mpic.c       Thu May  4 08:55:46 2006 -0400
+++ b/xen/arch/ppc/mpic.c       Thu May  4 08:57:37 2006 -0400
@@ -77,17 +77,23 @@ typedef int irqreturn_t;
 #include <xen/init.h>
 #include <xen/irq.h>
 #include <xen/smp.h>
-//#include <linux/interrupt.h>
-//#include <linux/bootmem.h>
+#ifndef __XEN__ 
+#include <linux/interrupt.h>
+#include <linux/bootmem.h>
+#endif
 #include <xen/spinlock.h>
-//#include <asm/pci.h>
-
-//#include <asm/ptrace.h>
-//#include <asm/signal.h>
+#ifndef __XEN__
+#include <asm/pci.h>
+
+#include <asm/ptrace.h>
+#include <asm/signal.h>
+#endif
 #include <asm/io.h>
-//#include <asm/pgtable.h>
-//#include <asm/irq.h>
-//#include <asm/machdep.h>
+#ifndef __XEN__
+#include <asm/pgtable.h>
+#include <asm/irq.h>
+#include <asm/machdep.h>
+#endif
 #include <asm/mpic.h>
 #include <asm/smp.h>
 
diff -r 445048da835fa0418f2ad04b0483f86cc6531104 -r 
29e803e524c2d47b8fca1ea9095f4295e1ce2ccb xen/arch/ppc/ppc64/hypercall_table.S
--- a/xen/arch/ppc/ppc64/hypercall_table.S      Thu May  4 08:55:46 2006 -0400
+++ b/xen/arch/ppc/ppc64/hypercall_table.S      Thu May  4 08:57:37 2006 -0400
@@ -4,33 +4,33 @@
         .align 3
         .globl __hypercall_table
 __hypercall_table:
-        .quad 0 // do_set_trap_table     /*  0 */
-        .quad 0 // do_mmu_update
-        .quad 0 // do_set_gdt
-        .quad 0 // do_stack_switch
-        .quad 0 // do_set_callbacks
-        .quad 0 // do_fpu_taskswitch     /*  5 */
+        .quad 0 /* do_set_trap_table */    /*  0 */
+        .quad 0 /* do_mmu_update */
+        .quad 0 /* do_set_gdt */
+        .quad 0 /* do_stack_switch */
+        .quad 0 /* do_set_callbacks */
+        .quad 0 /* do_fpu_taskswitch */     /*  5 */
         .quad do_sched_op
         .quad do_dom0_op
-        .quad 0 // do_set_debugreg
-        .quad 0 // do_get_debugreg
-        .quad 0 // do_update_descriptor  /* 10 */
+        .quad 0 /* do_set_debugreg */
+        .quad 0 /* do_get_debugreg */
+        .quad 0 /* do_update_descriptor */  /* 10 */
         .quad do_ni_hypercall
         .quad do_memory_op
-        .quad 0 // do_multicall
-        .quad 0 // do_update_va_mapping
+        .quad 0 /* do_multicall */
+        .quad 0 /* do_update_va_mapping */
         .quad do_set_timer_op       /* 15 */
         .quad do_event_channel_op
         .quad do_xen_version
         .quad do_console_io
         .quad do_physdev_op
-        .quad 0 // do_grant_table_op     /* 20 */
+        .quad 0 /* do_grant_table_op */     /* 20 */
         .quad do_vm_assist
-        .quad 0 // do_update_va_mapping_otherdomain
-        .quad 0 // do_switch_vm86
+        .quad 0 /* do_update_va_mapping_otherdomain */
+        .quad 0 /* do_switch_vm86 */
         .quad do_vcpu_op
         .quad do_ni_hypercall       /* 25 */
-        .quad 0 // do_mmuext_op
+        .quad 0 /* do_mmuext_op */
         .quad do_acm_op             /* 27 */
         .rept NR_hypercalls-((.-__hypercall_table)/8)
         .quad do_ni_hypercall
diff -r 445048da835fa0418f2ad04b0483f86cc6531104 -r 
29e803e524c2d47b8fca1ea9095f4295e1ce2ccb xen/arch/ppc/ppc64/ppc970.c
--- a/xen/arch/ppc/ppc64/ppc970.c       Thu May  4 08:55:46 2006 -0400
+++ b/xen/arch/ppc/ppc64/ppc970.c       Thu May  4 08:57:37 2006 -0400
@@ -64,10 +64,11 @@ void cpu_initialize(void)
     ulong s = 0;
 
     s |= 1UL << (63-0);     /* one_ppc */
-//    s |= 1UL << (63-1);     /* do_single */
     s |= 1UL << (63-2);     /* isync_sc */
-//    s |= 1UL << (63-3);     /* ser-gp */
     s |= 1UL << (63-16);     /* inorder */
+    /* may not want these */
+    s |= 1UL << (63-1);     /* do_single */
+    s |= 1UL << (63-3);     /* ser-gp */
     hid0.word |= s;
 #endif
     printk("hid0: 0x%016lx\n", hid0.word);



_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.