Changeset 253f35a1 in mainline for kernel/arch/sparc64/src

Timestamp:

2006-09-07T19:56:44Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ab1ae2d9

Parents:

801579fe

Message:

sparc64 work.

• Changes to enable userspace keyboard drivers.
• Fix z8530 initialization (i.e. clear any pending Tx interrupts).
• Experimental support for framebuffers with inverted colors.

Location:

kernel/arch/sparc64/src

Files:

• console.c (modified) (1 diff)
• drivers/fhc.c (modified) (1 diff)
• sparc64.c (modified) (1 diff)
• trap/interrupt.c (modified) (3 diffs)

kernel/arch/sparc64/src/console.c

@@ -94 +94 @@
 }
 
+/** Acquire console back for kernel
+ *
+ */
+void arch_grab_console(void)
+{
+#ifdef CONFIG_Z8530
+        z8530_grab();
+#endif
+}
+
+/** Return console to userspace
+ *
+ */
+void arch_release_console(void)
+{
+#ifdef CONFIG_Z8530
+        z8530_release();
+#endif
+}
 /** @}
  */

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

@@ -58 +58 @@
         fhc = (void *) hw_map(FHC_UART_ADDR, PAGE_SIZE);
 
-        (void) fhc[FHC_UART_ICLR];
         fhc[FHC_UART_ICLR] = 0;
-        (void) fhc[FHC_UART_IMAP];
-        fhc[FHC_UART_IMAP] = Z8530_INTRCV_DATA0;        /* hardcoded for Simics simulation */
-        (void) fhc[FHC_UART_IMAP];
-        fhc[FHC_UART_IMAP] = 0x80000000;                /* hardcoded for Simics simulation */
+        fhc[FHC_UART_IMAP] = 0x80000000;
 }
 
 void fhc_uart_reset(void)
 {
-        (void) fhc[FHC_UART_ICLR];
         fhc[FHC_UART_ICLR] = 0;
 }

kernel/arch/sparc64/src/sparc64.c

@@ -94 +94 @@
 }
 
-/** Acquire console back for kernel
- *
- */
-void arch_grab_console(void)
-{
-}
-/** Return console to userspace
- *
- */
-void arch_release_console(void)
-{
-}
-
 /** Switch to userspace. */
 void userspace(uspace_arg_t *kernel_uarg)

kernel/arch/sparc64/src/trap/interrupt.c

@@ -43 +43 @@
 #include <arch/asm.h>
 #include <arch/barrier.h>
-
+#include <print.h>
 #include <genarch/kbd/z8530.h>
 
@@ -62 +62 @@
 void irq_ipc_bind_arch(unative_t irq)
 {
-        /* TODO */
+#ifdef CONFIG_Z8530
+        z8530_belongs_to_kernel = false;
+#endif
 }
 
@@ -83 +85 @@
                  * interrupt traps. Call the interrupt handler directly.
                  */
+
+                if (z8530_belongs_to_kernel)
+                        z8530_interrupt();
+                else
+                        ipc_irq_send_notif(0);
                 fhc_uart_reset();
-                z8530_interrupt();
                 break;
+
 #endif
         }