Changeset 9979acb in mainline for kernel/genarch/include

Timestamp:

2009-02-20T17:19:03Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c9b550b

Parents:

5c06c1c

Message:

make hw_area API more generic
this allows mapping of EGA VRAM on ia32/amd64

Location:

kernel/genarch/include/drivers

Files:

• ega/ega.h (modified) (2 diffs)
• legacy/ia32/io.h (modified) (2 diffs)

kernel/genarch/include/drivers/ega/ega.h

@@ -27 +27 @@
  */
 
-/** @addtogroup genarch_drivers 
+/** @addtogroup genarch_drivers
  * @{
  */
@@ -38 +38 @@
 #include <arch/types.h>
 
-#define ROW             80
-#define ROWS            25
-#define SCREEN          (ROW * ROWS)
+#define EGA_COLS       80
+#define EGA_ROWS       25
+#define EGA_SCREEN     (EGA_COLS * EGA_ROWS)
+#define EGA_VRAM_SIZE  (2 * EGA_SCREEN)
 
 /* EGA device registers. */
-#define EGA_INDEX_REG   0
-#define EGA_DATA_REG    1
+#define EGA_INDEX_REG  0
+#define EGA_DATA_REG   1
 
 extern void ega_redraw(void);

kernel/genarch/include/drivers/legacy/ia32/io.h

@@ -31 +31 @@
  */
 /** @file
- * @brief       This file contains definitions used by architectures with the
- *              ia32 legacy I/O space (i.e. ia32, amd64 and ia64). 
+ * @brief This file contains definitions used by architectures with the
+ *        ia32 legacy I/O space (i.e. ia32, amd64 and ia64).
  */
 
@@ -40 +40 @@
 #include <arch/types.h>
 
-#define I8042_BASE      ((ioport8_t *)0x60)
+#define I8042_BASE    ((ioport8_t *) 0x60)
+#define EGA_BASE      ((ioport8_t *) 0x3d4)
+#define NS16550_BASE  ((ioport8_t *) 0x3f8)
 
-#define EGA_VIDEORAM    0xb8000
-#define EGA_BASE        ((ioport8_t *)0x3d4)
-
-#define NS16550_BASE    ((ioport8_t *)0x3f8)
+#define EGA_VIDEORAM  0xb8000
 
 #endif