Changeset 6da1013f in mainline for kernel/arch/ia64/src

Timestamp:

2009-02-12T20:09:19Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

84266669

Parents:

7004747

Message:

simplify configuration
introduce arch_construct_function and inb/outb (sometimes empty) on all platforms
various code cleanup

Location:

kernel/arch/ia64/src

Files:

• ia64.c (modified) (3 diffs)
• interrupt.c (modified) (2 diffs)
• ski/ski.c (modified) (4 diffs)

kernel/arch/ia64/src/ia64.c

@@ -133 +133 @@
 #ifdef SKI
                 ski_init_console();
-#else   
+#else
                 ega_init(EGA_BASE, EGA_VIDEORAM);
-#endif  
+#endif
         }
         it_init();
@@ -266 +266 @@
 #ifdef SKI
         ski_kbd_release();
-#else   
+#else
 #ifdef CONFIG_NS16550
         ns16550_release();
-#else   
+#else
         i8042_release();
-#endif  
+#endif
 #endif
 }
@@ -282 +282 @@
 }
 
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+        fptr->fnc = (unative_t) addr;
+        fptr->gp = ((unative_t *) caller)[1];
+        
+        return (void *) fptr;
+}
+
 /** @}
  */

kernel/arch/ia64/src/interrupt.c

@@ -195 +195 @@
 void disabled_fp_register(uint64_t vector, istate_t *istate)
 {
-#ifdef CONFIG_FPU_LAZY 
-        scheduler_fpu_lazy_request();   
+#ifdef CONFIG_FPU_LAZY
+        scheduler_fpu_lazy_request();
 #else
         fault_if_from_uspace(istate, "Interruption: %#hx (%s).",
@@ -302 +302 @@
 }
 
+void trap_virtual_enable_irqs(uint16_t irqmask)
+{
+}
+
 /** @}
  */

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

@@ -47 +47 @@
 #include <arch/drivers/kbd.h>
 
-#define SKI_KBD_INR     0
+#define SKI_KBD_INR  0
 
 static irq_t ski_kbd_irq;
@@ -115 +115 @@
 {
         int ch;
-
-        while(!(ch = ski_getchar()))
-                ;
+        
+        while(!(ch = ski_getchar()));
+        
         if (ch == '\r')
                 ch = '\n'; 
@@ -129 +129 @@
         static char last; 
         ipl_t ipl;
-
+        
         ipl = interrupts_disable();
-
+        
         if (kbd_disabled) {
                 interrupts_restore(ipl);
                 return;
         }
-                
+        
         spinlock_lock(&ski_kbd_irq.lock);
-
+        
         ch = ski_getchar();
         if(ch == '\r')
@@ -178 +178 @@
 static void ski_kbd_disable(chardev_t *d)
 {
-        kbd_disabled = true;    
+        kbd_disabled = true;
 }