Changeset a2a5529 in mainline for kernel/arch/sparc64/include

Timestamp:

2008-11-11T07:50:04Z (17 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

59e4864

Parents:

b24786a3

Message:

Support for serial port console on IA64 as a compensation for keyboard - based on SPARC ns16550 driver

Location:

kernel/arch/sparc64/include

Files:

• asm.h (modified) (1 diff)
• drivers/ns16550.h (modified) (1 diff)

kernel/arch/sparc64/include/asm.h

@@ -44 +44 @@
 #include <arch/stack.h>
 
+typedef uint64_t ioport_t;
+
+
+static inline void  outb(ioport_t port,uint8_t v)
+{
+        *((uint8_t *)(port)) = v;
+}
+
+static inline void  outw(ioport_t port,uint16_t v)
+{
+        *((uint16_t *)(port)) = v;
+}
+
+static inline void  outl(ioport_t port,uint32_t v)
+{
+        *((uint32_t *)(port)) = v;
+}
+
+
+
+static inline uint8_t inb(ioport_t port)
+{
+        return *((uint8_t *)(port));
+}
+
+static inline uint16_t inw(ioport_t port)
+{
+        return *((uint16_t *)(port));
+}
+
+static inline uint32_t inl(ioport_t port)
+{
+        return *((uint32_t *)(port));
+}
+
+
+
+
+
 /** Read Processor State register.
  *

kernel/arch/sparc64/include/drivers/ns16550.h

@@ -36 +36 @@
 #define KERN_sparc64_NS16550_H_
 
-#include <arch/types.h>
-#include <arch/drivers/kbd.h>
-
-/* NS16550 registers */
-#define RBR_REG         0       /** Receiver Buffer Register. */
-#define IER_REG         1       /** Interrupt Enable Register. */
-#define IIR_REG         2       /** Interrupt Ident Register (read). */
-#define FCR_REG         2       /** FIFO control register (write). */
-#define LCR_REG         3       /** Line Control register. */
-#define LSR_REG         5       /** Line Status Register. */
-
-#define IER_ERBFI       0x01    /** Enable Receive Buffer Full Interrupt. */
-
-#define LCR_DLAB        0x80    /** Divisor Latch Access bit. */
-
-/** Structure representing the ns16550 device. */
-typedef struct {
-        devno_t devno;
-        volatile uint8_t *reg;  /** Memory mapped registers of the ns16550. */
-} ns16550_t;
-
-static inline uint8_t ns16550_rbr_read(ns16550_t *dev)
-{
-        return dev->reg[RBR_REG];
-}
-
-static inline uint8_t ns16550_ier_read(ns16550_t *dev)
-{
-        return dev->reg[IER_REG];
-}
-
-static inline void ns16550_ier_write(ns16550_t *dev, uint8_t v)
-{
-        dev->reg[IER_REG] = v;
-}
-
-static inline uint8_t ns16550_iir_read(ns16550_t *dev)
-{
-        return dev->reg[IIR_REG];
-}
-
-static inline void ns16550_fcr_write(ns16550_t *dev, uint8_t v)
-{
-        dev->reg[FCR_REG] = v;
-}
-
-static inline uint8_t ns16550_lcr_read(ns16550_t *dev)
-{
-        return dev->reg[LCR_REG];
-}
-
-static inline void ns16550_lcr_write(ns16550_t *dev, uint8_t v)
-{
-        dev->reg[LCR_REG] = v;
-}
-
-static inline uint8_t ns16550_lsr_read(ns16550_t *dev)
-{
-        return dev->reg[LSR_REG];
-}
 
 #endif