Changeset 254 for trunk

Timestamp:

Jul 20, 2017, 2:24:37 PM (7 years ago)

Author:

max@…

Message:

Use IMPL_TXT_RS2.

Location:

trunk

Files:

• hal/x86_64/core/hal_drivers.c (modified) (1 diff)
• hal/x86_64/core/hal_init.c (modified) (2 diffs)
• kernel/devices/dev_txt.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_drivers.c

@@ -31 +31 @@
 void hal_drivers_txt_init(chdev_t *txt, uint32_t impl)
 {
+        if (impl != IMPL_TXT_RS2) {
+                x86_panic("undefined TXT device implementation");
+        }
+
         txt_rs232_init(txt);
 }

trunk/hal/x86_64/core/hal_init.c

@@ -199 +199 @@
 
         /* COM1 */
-        dev->irq[IRQ_COM1].dev_type = (DEV_FUNC_TXT << 16) | IMPL_TXT_TTY;
+        dev->irq[IRQ_COM1].dev_type = (DEV_FUNC_TXT << 16) | IMPL_TXT_RS2;
         dev->irq[IRQ_COM1].channel = 0;
         dev->irq[IRQ_COM1].is_rx = 0;
@@ -216 +216 @@
 
         dev->base = 0;
-        dev->type = (DEV_FUNC_TXT << 16) | IMPL_TXT_TTY;
+        dev->type = (DEV_FUNC_TXT << 16) | IMPL_TXT_RS2;
         dev->channels = 1;
         dev->param0 = 0;

trunk/kernel/devices/dev_txt.h

@@ -53 +53 @@
 {
     IMPL_TXT_TTY =   0,
-    IMPL_TXT_X86 =   1,
+    IMPL_TXT_RS2 =   1,
 }
 txt_impl_t;