Changeset aa8d0f7 in mainline

Timestamp:

2008-11-11T22:39:21Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1025d28

Parents:

ff3b7da7

Message:

Some cstyle.

Location:

kernel

Files:

• genarch/src/kbd/ns16550.c (modified) (3 diffs)
• generic/src/proc/thread.c (modified) (1 diff)

kernel/genarch/src/kbd/ns16550.c

@@ -137 +137 @@
 #ifdef ia64
         uint8_t c;
-        c=ns16550_lcr_read(&ns16550);
-        ns16550_lcr_write(&ns16550,0x80|c);
-        ns16550_rbr_write(&ns16550,0x0c);
-        ns16550_ier_write(&ns16550,0x00);
-        ns16550_lcr_write(&ns16550,c);
+        c = ns16550_lcr_read(&ns16550);
+        ns16550_lcr_write(&ns16550, 0x80 | c);
+        ns16550_rbr_write(&ns16550, 0x0c);
+        ns16550_ier_write(&ns16550, 0x00);
+        ns16550_lcr_write(&ns16550, c);
 #endif
         
@@ -184 +184 @@
                 }
 #else
-        extern chardev_t kbrd;
-        if(x!=0x0d)
-        {
-            if(x==0x7f) x='\b';
-            chardev_push_character(&kbrd,x);
-        }    
+                extern chardev_t kbrd;
+                if(x != 0x0d) {
+                        if(x == 0x7f)
+                                x = '\b';
+                         chardev_push_character(&kbrd, x);
+                }    
 #endif          
 
@@ -234 +234 @@
                 }
 #else
-        extern chardev_t kbrd;
-        if(x!=0x0d)
-        {
-            if(x==0x7f) x='\b';
-            chardev_push_character(&kbrd,x);
-        }    
+                extern chardev_t kbrd;
+                if(x != 0x0d) {
+                        if (x == 0x7f)
+                                x = '\b';
+                        chardev_push_character(&kbrd, x);
+                }    
 #endif          
 

kernel/generic/src/proc/thread.c

@@ -296 +296 @@
         if (!t)
                 return NULL;
+        
         /* Not needed, but good for debugging */
         memsetb(t->kstack, THREAD_STACK_SIZE * 1 << STACK_FRAMES, 0);