Changeset 255 for trunk

Timestamp:

Jul 20, 2017, 2:35:44 PM (7 years ago)

Author:

max@…

Message:

Don't route the IRQ for IMPL_TXT_RS2, it is multiplexed in software.

Location:

trunk

Files:

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

trunk/hal/x86_64/core/hal_init.c

@@ -217 +217 @@
         dev->base = 0;
         dev->type = (DEV_FUNC_TXT << 16) | IMPL_TXT_RS2;
-        dev->channels = 1;
+        dev->channels = 4;
         dev->param0 = 0;
         dev->param1 = 0;

trunk/kernel/devices/dev_txt.c

@@ -57 +57 @@
     hal_drivers_txt_init(txt, impl);
 
-    // no server thread and no IRQ routing for TXT0
-    if( channel != 0 )
+    // no server thread and no IRQ routing for TXT0 and IMPL_TXT_RS2 (multiplexed
+    // in software, not hardware)
+    if( channel != 0 && impl != IMPL_TXT_RS2 )
     {
         // select a core to execute the TXT server thread