WebSVN – HelenOS – Path Comparison – / – /branches/dynload/kernel/genarch/ Rev 4342 and /branches/dynload/kernel/genarch/ Rev 4343

Ignore whitespace Rev 4342 → Rev 4343

 /branches/dynload/kernel/genarch/include/kbd/z8530.h
 ,8 → 49,8
 extern void z8530_release(void);
 extern void z8530_interrupt(void);
 extern char z8530_key_read(chardev_t *);
-extern irq_ownership_t z8530_claim(void);
-extern void z8530_irq_handler(irq_t *, void *, ...);
+extern irq_ownership_t z8530_claim(void *);
+extern void z8530_irq_handler(irq_t *);
 #endif

 /branches/dynload/kernel/genarch/include/kbd/ns16550.h
 ,7 → 37,7
 #ifndef KERN_NS16550_H_
 #define KERN_NS16550_H_
-#include <console/chardev.h>
+#include <console/chardev.h>
 #include <ddi/irq.h>
 #include <ipc/irq.h>
 ,13 → 46,12
 extern void ns16550_grab(void);
 extern void ns16550_release(void);
 extern char ns16550_key_read(chardev_t *);
-extern irq_ownership_t ns16550_claim(void);
-extern void ns16550_irq_handler(irq_t *, void *, ...);
+extern irq_ownership_t ns16550_claim(void *);
+extern void ns16550_irq_handler(irq_t *);
 #include <arch/types.h>
-#ifndef ia64
 #include <arch/drivers/kbd.h>
-#endif
 /* NS16550 registers */
 #define RBR_REG     0    /** Receiver Buffer Register. */
 #define IER_REG     1   /** Interrupt Enable Register. */
 ,56 → 76,56
 static inline uint8_t ns16550_rbr_read(ns16550_t *dev)
 {
-    return inb(dev->io_port + RBR_REG);
+    return pio_read_8(dev->io_port + RBR_REG);
 }
 static inline void ns16550_rbr_write(ns16550_t *dev, uint8_t v)
 {
-    outb(dev->io_port + RBR_REG, v);
+    pio_write_8(dev->io_port + RBR_REG, v);
 }
 static inline uint8_t ns16550_ier_read(ns16550_t *dev)
 {
-    return inb(dev->io_port + IER_REG);
+    return pio_read_8(dev->io_port + IER_REG);
 }
 static inline void ns16550_ier_write(ns16550_t *dev, uint8_t v)
 {
-    outb(dev->io_port + IER_REG, v);
+    pio_write_8(dev->io_port + IER_REG, v);
 }
 static inline uint8_t ns16550_iir_read(ns16550_t *dev)
 {
-    return inb(dev->io_port + IIR_REG);
+    return pio_read_8(dev->io_port + IIR_REG);
 }
 static inline void ns16550_fcr_write(ns16550_t *dev, uint8_t v)
 {
-    outb(dev->io_port + FCR_REG, v);
+    pio_write_8(dev->io_port + FCR_REG, v);
 }
 static inline uint8_t ns16550_lcr_read(ns16550_t *dev)
 {
-    return inb(dev->io_port + LCR_REG);
+    return pio_read_8(dev->io_port + LCR_REG);
 }
 static inline void ns16550_lcr_write(ns16550_t *dev, uint8_t v)
 {
-    outb(dev->io_port + LCR_REG, v);
+    pio_write_8(dev->io_port + LCR_REG, v);
 }
 static inline uint8_t ns16550_lsr_read(ns16550_t *dev)
 {
-    return inb(dev->io_port + LSR_REG);
+    return pio_read_8(dev->io_port + LSR_REG);
 }
 static inline uint8_t ns16550_mcr_read(ns16550_t *dev)
 {
-    return inb(dev->io_port + MCR_REG);
+    return pio_read_8(dev->io_port + MCR_REG);
 }
 static inline void ns16550_mcr_write(ns16550_t *dev, uint8_t v)
 {
-    outb(dev->io_port + MCR_REG, v);
+    pio_write_8(dev->io_port + MCR_REG, v);
 }
 #endif

 /branches/dynload/kernel/genarch/src/kbd/ns16550.c
 ,11 → 138,9
     sysinfo_set_item_val("kbd.address.virtual", NULL, port);
     sysinfo_set_item_val("kbd.port", NULL, port);
-#ifdef CONFIG_NS16550_INTERRUPT_DRIVEN
     /* Enable interrupts */
     ns16550_ier_write(&ns16550, IER_ERBFI);
     ns16550_mcr_write(&ns16550, MCR_OUT2);
-#endif
     uint8_t c;
     // This switches rbr & ier to mode when accept baudrate constant
 ,28 → 196,6
  */
 void ns16550_poll(void)
 {
-#ifndef CONFIG_NS16550_INTERRUPT_DRIVEN
-    ipl_t ipl;
-    ipl = interrupts_disable();
-    spinlock_lock(&ns16550_irq.lock);
-    if (ns16550_lsr_read(&ns16550) & LSR_DATA_READY) {
-        if (ns16550_irq.notif_cfg.notify && ns16550_irq.notif_cfg.answerbox) {
-            /*
-             * Send IPC notification.
-             */
-            ipc_irq_send_notif(&ns16550_irq);
-            spinlock_unlock(&ns16550_irq.lock);
-            interrupts_restore(ipl);
-            return;
-        }
-    }
-    spinlock_unlock(&ns16550_irq.lock);
-    interrupts_restore(ipl);
-#endif
     while (ns16550_lsr_read(&ns16550) & LSR_DATA_READY) {
         uint8_t x;
 ,12 → 210,12
     }
 }
-irq_ownership_t ns16550_claim(void)
+irq_ownership_t ns16550_claim(void *instance)
 {
     return (ns16550_lsr_read(&ns16550) & LSR_DATA_READY);
 }
-void ns16550_irq_handler(irq_t *irq, void *arg, ...)
+void ns16550_irq_handler(irq_t *irq)
 {
     if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)
         ipc_irq_send_notif(irq);

 /branches/dynload/kernel/genarch/src/kbd/i8042.c
 ,12 → 123,12
     interrupts_restore(ipl);
 }
-static irq_ownership_t i8042_claim(void)
+static irq_ownership_t i8042_claim(void *instance)
 {
     return IRQ_ACCEPT;
 }
-static void i8042_irq_handler(irq_t *irq, void *arg, ...)
+static void i8042_irq_handler(irq_t *irq)
 {
     if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)
         ipc_irq_send_notif(irq);

 /branches/dynload/kernel/genarch/src/kbd/z8530.c
 ,12 → 194,12
     }
 }
-irq_ownership_t z8530_claim(void)
+irq_ownership_t z8530_claim(void *instance)
 {
     return (z8530_read_a(&z8530, RR0) & RR0_RCA);
 }
-void z8530_irq_handler(irq_t *irq, void *arg, ...)
+void z8530_irq_handler(irq_t *irq)
 {
     if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)
         ipc_irq_send_notif(irq);

 /branches/dynload/kernel/genarch/src/fb/fb.c
 ,9 → 52,6
 SPINLOCK_INITIALIZE(fb_lock);
-/**< Physical memory area for fb. */
-static parea_t fb_parea;
 static uint8_t *fb_addr;
 static uint8_t *backbuf;
 static uint8_t *glyphs;
 ,12 → 516,6
     fb_addr = (uint8_t *) hw_map((uintptr_t) props->addr, fbsize);
-    fb_parea.pbase = (uintptr_t) props->addr + props->offset;
-    fb_parea.vbase = (uintptr_t) fb_addr;
-    fb_parea.frames = SIZE2FRAMES(fbsize);
-    fb_parea.cacheable = false;
-    ddi_parea_register(&fb_parea);
     sysinfo_set_item_val("fb", NULL, true);
     sysinfo_set_item_val("fb.kind", NULL, 1);
     sysinfo_set_item_val("fb.width", NULL, xres);

 /branches/dynload/kernel/genarch/src/drivers/ega/ega.c
 ,8 → 54,6
  * Simple and short. Function for displaying characters and "scrolling".
  */
-static parea_t ega_parea;   /**< Physical memory area for EGA video RAM. */
 SPINLOCK_INITIALIZE(egalock);
 static uint32_t ega_cursor;
 static uint8_t *videoram;
 ,10 → 81,10
 static void ega_move_cursor(void)
 {
-    outb(ega_base + EGA_INDEX_REG, 0xe);
-    outb(ega_base + EGA_DATA_REG, (uint8_t) ((ega_cursor >> 8) & 0xff));
-    outb(ega_base + EGA_INDEX_REG, 0xf);
-    outb(ega_base + EGA_DATA_REG, (uint8_t) (ega_cursor & 0xff));
+    pio_write_8(ega_base + EGA_INDEX_REG, 0xe);
+    pio_write_8(ega_base + EGA_DATA_REG, (uint8_t) ((ega_cursor >> 8) & 0xff));
+    pio_write_8(ega_base + EGA_INDEX_REG, 0xf);
+    pio_write_8(ega_base + EGA_DATA_REG, (uint8_t) (ega_cursor & 0xff));
 }
 static void ega_display_char(char ch, bool silent)
 ,12 → 150,6
     chardev_initialize("ega_out", &ega_console, &ega_ops);
     stdout = &ega_console;
-    ega_parea.pbase = videoram_phys;
-    ega_parea.vbase = (uintptr_t) videoram;
-    ega_parea.frames = 1;
-    ega_parea.cacheable = false;
-    ddi_parea_register(&ega_parea);
     sysinfo_set_item_val("fb", NULL, true);
     sysinfo_set_item_val("fb.kind", NULL, 2);
     sysinfo_set_item_val("fb.width", NULL, ROW);

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4342 → Rev 4343