Changeset 0f74869 in mainline for kernel/arch/sparc64/src

Timestamp:

2009-02-22T15:20:43Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f9f9a13

Parents:

e7abb0e

Message:

Unbreak sparc64.
Due to the lack of userspace bus drivers for the z8530 and ns16550,
we are currently handling exactly one interrupt from these devices
in userspace.

Location:

kernel/arch/sparc64/src

Files:

• console.c (modified) (2 diffs)
• drivers/kbd.c (modified) (1 diff)
• drivers/sgcn.c (modified) (1 diff)

kernel/arch/sparc64/src/console.c

@@ -163 +163 @@
 #endif
         switch (kbd_type) {
-#ifdef CONFIG_Z8530
-        case KBD_Z8530:
-                z8530_grab();
-                break;
-#endif
-#ifdef CONFIG_NS16550
-        case KBD_NS16550:
-                ns16550_grab();
-                break;
-#endif
 #ifdef CONFIG_SGCN
         case KBD_SGCN:
@@ -189 +179 @@
 {
         switch (kbd_type) {
-#ifdef CONFIG_Z8530
-        case KBD_Z8530:
-                z8530_release();
-                break;
-#endif
-#ifdef CONFIG_NS16550
-        case KBD_NS16550:
-                ns16550_release();
-                break;
-#endif
 #ifdef CONFIG_SGCN
         case KBD_SGCN:

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

@@ -149 +149 @@
 #ifdef CONFIG_Z8530
         case KBD_Z8530:
-                z8530_init(device_assign_devno(),
-                    hw_map(aligned_addr, offset + size) + offset, inr, cir, cir_arg);
+                (void) z8530_init((z8530_t *) hw_map(aligned_addr,
+                    offset + size) + offset, device_assign_devno(), inr, cir,
+                    cir_arg);
                 break;
 #endif

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

@@ -382 +382 @@
         
         if (*in_rdptr_ptr != *in_wrptr_ptr) {
-                if (sgcn_irq.notif_cfg.notify && sgcn_irq.notif_cfg.answerbox) {
-                        ipc_irq_send_notif(&sgcn_irq);
-                        spinlock_unlock(&sgcn_irq.lock);
-                        interrupts_restore(ipl);
-                        spinlock_unlock(&sgcn_input_lock);
-                        return;
-                }
+                /* XXX: send notification to userspace */
         }