Changeset ee06f2a in mainline for kernel/genarch/include/kbd/ns16550.h

Timestamp:

2009-02-15T15:28:00Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2d96f4d

Parents:

e7f2ad68

Message:

Introduce a more platform-neutral name for programmed I/O.

The new API looks like pio_read_n() or pio_write_n(), where n is 8, 16 or 32.
The old API (i.e. inb(), inw(), inl(), outb() outw(), outl()) may have made
some people think that the interface is only to be used with the separate I/O
space. That's not the case. This API is to be implemented on all platforms
so that we can finally have really generic kernel device drivers.

File:

• kernel/genarch/include/kbd/ns16550.h (modified) (1 diff)

kernel/genarch/include/kbd/ns16550.h

@@ -78 +78 @@
 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);
 }