Changeset 880de6e in mainline

Timestamp:

2005-11-28T16:12:35Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5ff4f6b

Parents:

5803145

Message:

Clean up.

Files:

• arch/ia32/src/smp/apic.c (modified) (1 diff)
• arch/ia64/src/drivers/keyboard.c (modified) (5 diffs)
• arch/ia64/src/ski/ski.c (modified) (1 diff)
• doc/arch/ia32 (modified) (1 diff)
• generic/src/main/kinit.c (modified) (1 diff)
• generic/src/main/main.c (modified) (3 diffs)

arch/ia32/src/smp/apic.c

@@ -44 +44 @@
  * Tested on:
  *      Bochs 2.0.2 - Bochs 2.2 with 2-8 CPUs
- *      Simics 2.0.28 - Simics 2.2.19 2-8 CPUs
+ *      Simics 2.0.28 - Simics 2.2.19 2-15 CPUs
  *      VMware Workstation 5.5 with 2 CPUs
  *      ASUS P/I-P65UP5 + ASUS C-P55T2D REV. 1.41 with 2x 200Mhz Pentium CPUs

arch/ia64/src/drivers/keyboard.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2003 Josef Cejka
- * Copyright (C) 2005 Jakub Jermar
  * Copyright (C) 2005 Jakub Vana
  * All rights reserved.
@@ -47 +45 @@
 };
 
-
-int kb_disable;
-
+bool kb_disable;
 
 /** Initialize keyboard subsystem. */
@@ -59 +55 @@
 }
 
-/** Process keyboard interrupt. */
+/** Ask keyboard if a key was pressed. */
 void poll_keyboard(void)
 {
-        if(kb_disable) return;
         char ch;
 
+        if (kb_disable)
+                return;
+
         ch = ski_getchar();
-        if(ch=='\r') ch='\n'; 
-        if(ch) chardev_push_character(&kbrd, ch);
-        
+        if(ch == '\r')
+                ch = '\n'; 
+        if (ch)
+                chardev_push_character(&kbrd, ch);
 }
 
@@ -74 +73 @@
 void keyboard_enable(void)
 {
-        kb_disable=false;
+        kb_disable = false;
 }
 
@@ -80 +79 @@
 void keyboard_disable(void)
 {
-        kb_disable=true;        
+        kb_disable = true;      
 }

arch/ia64/src/ski/ski.c

@@ -66 +66 @@
 }
 
-
-/** Display character on debug console
+/** Ask debug console if a key was pressed.
  *
  * Use SSC (Simulator System Call) to
  * get character from debug console.
- * Non blocking HW call
- * @return Returns ascii code of pressed key or 0 if no key pressed
+ *
+ * This call is non-blocking.
+ *
+ * @return ASCII code of pressed key or 0 if no key pressed.
  */
 __s32 ski_getchar(void)

doc/arch/ia32

@@ -20 +20 @@
                 o 2x-8x 686 CPU
         o Simics 2.0.28 - Simics 2.2.19
-                o 2x-8x Pentium 4 CPU
+                o 2x-15x Pentium 4 CPU
         o VMware Workstation 5.5
                 o 2x CPU

generic/src/main/kinit.c

@@ -58 +58 @@
 #endif /* CONFIG_TEST */
 
-
-
+/** Kernel initialization thread.
+ *
+ * kinit takes care of higher level kernel
+ * initialization (i.e. thread creation,
+ * userspace initialization etc.).
+ *
+ * @param arg Not used.
+ */
 void kinit(void *arg)
 {

generic/src/main/main.c

@@ -77 +77 @@
 context_t ctx;
 
-/*
- * These 'hardcoded' variables will be intialised by
+/**
+ * These 'hardcoded' variables will be intialized by
  * the linker or the low level assembler code with
  * appropriate sizes and addresses.
@@ -89 +89 @@
 size_t init_size = 0;
 
-/*
+/**
  * Size of memory in bytes taken by kernel and heap.
  */
 static size_t kernel_size;
 
-/*
+/**
  * Size of heap.
  */
@@ -100 +100 @@
 
 
-/*
+/**
  * Extra space between heap and stack
  * enforced by alignment requirements.