Changeset dbfa3148 in rtems

Timestamp:

07/10/98 15:43:18 (25 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

3a447c3

Parents:

cc8a388a

Message:

Patch from Quality Quorum <qqi@…>. Comments:

c/src/lib/libbsp/i386/pc386/console/console.c

assert() modified so it prints on selected console instead of
PC console

c/src/lib/libbsp/i386/pc386/console/inch.c

inch_sleep() modified, so it does not depend upon tmacros.h

c/src/lib/libbsp/i386/pc386/pc386dev/GDB.HOWTO

description updated

c/src/lib/libbsp/i386/pc386/startup/exit.c

last output before call to exit() will be printed properly on
serial console

c/src/lib/libbsp/i386/pc386/startup/irq.c

re-submitted bug fix for problem in irqs over 7.

Location:

c/src/lib/libbsp/i386/pc386

Files:

• console/console.c (modified) (3 diffs)
• console/inch.c (modified) (2 diffs)
• startup/exit.c (modified) (2 diffs)

c/src/lib/libbsp/i386/pc386/console/console.c

@@ -32 +32 @@
 +--------------------------------------------------------------------------*/
 
-
+#include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -58 +58 @@
        /* keyboard (IRQ 0x01) Interrupt Service Routine (defined in 'inch.c') */
 
+extern rtems_boolean _IBMPC_scankey(char *);  /* defined in 'inch.c' */
 
 void console_reserve_resources(rtems_configuration_table *conf)
@@ -70 +71 @@
 void __assert(const char *file, int line, const char *msg)
 {
-  printk("assert failed: %s: ", file);
-  printk("%d: ", line);
-  printk("%s\n", msg);
-
-  exit(1);
-
-  return;
+  static   char buf[20];
+  static   char exit_msg[] = "EXECUTIVE SHUTDOWN! Any key to reboot...";
+  static   char assert_msg[] = "assert failed: ";
+  unsigned char  ch;
+  const    unsigned char *cp;
+        
+ 
+  /*
+   * Note we cannot call exit or printf from here, 
+   * assert can fail inside ISR too
+   */
+  if(PC386ConsolePort == PC386_CONSOLE_PORT_CONSOLE)
+    {
+      printk("\nassert failed: %s: ", file);
+      printk("%d: ", line);
+      printk("%s\n\n", msg);
+      printk(exit_msg);
+      while(!_IBMPC_scankey(&ch));
+      printk("\n\n");
+    }
+  else
+    {
+      PC386_uart_intr_ctrl(PC386ConsolePort, PC386_UART_INTR_CTRL_DISABLE);
+      
+      PC386_uart_polled_write(PC386ConsolePort, '\r');
+      PC386_uart_polled_write(PC386ConsolePort, '\n');
+      
+      for(cp=assert_msg; *cp!=0; cp++)
+        {
+          PC386_uart_polled_write(PC386ConsolePort, *cp);
+        }
+
+      for(cp=file; *cp!=0; cp++)
+        {
+          PC386_uart_polled_write(PC386ConsolePort, *cp);
+        }
+      
+      PC386_uart_polled_write(PC386ConsolePort, ':');
+      PC386_uart_polled_write(PC386ConsolePort, ' ');
+
+      sprintf(buf, "%d: ", line);
+
+      for(cp=buf; *cp!=0; cp++)
+        {
+          PC386_uart_polled_write(PC386ConsolePort, *cp);
+        }
+
+      for(cp=msg; *cp!=0; cp++)
+        {
+          PC386_uart_polled_write(PC386ConsolePort, *cp);
+        }
+
+      PC386_uart_polled_write(PC386ConsolePort, '\r');
+      PC386_uart_polled_write(PC386ConsolePort, '\n');
+      PC386_uart_polled_write(PC386ConsolePort, '\r');
+      PC386_uart_polled_write(PC386ConsolePort, '\n');
+          
+      for(cp=exit_msg; *cp != 0; cp++)
+        {
+          PC386_uart_polled_write(PC386ConsolePort, *cp);
+        }
+
+      PC386_uart_polled_read(PC386ConsolePort);
+
+      PC386_uart_polled_write(PC386ConsolePort, '\r');
+      PC386_uart_polled_write(PC386ConsolePort, '\n');
+      PC386_uart_polled_write(PC386ConsolePort, '\r');
+      PC386_uart_polled_write(PC386ConsolePort, '\n');
+
+    }
+
+  rtemsReboot();
 }
+
 
 /*-------------------------------------------------------------------------+

c/src/lib/libbsp/i386/pc386/console/inch.c

@@ -293 +293 @@
 _IBMPC_inch_sleep(void)
 {
-    char c;
-    extern rtems_interval _TOD_Ticks_per_second; /* XXX should not do this */ 
-    rtems_interval ticks_to_delay;
-
-    ticks_to_delay = (_TOD_Ticks_per_second + 24) / 25; 
+    char           c;
+    rtems_interval ticks_per_second;
+
+    ticks_per_second = 0;
 
     for(;;)
@@ -305 +304 @@
             return c;
           }
-        rtems_task_wake_after(ticks_to_delay);
+ 
+        if(ticks_per_second == 0)
+          {
+            rtems_clock_get(RTEMS_CLOCK_GET_TICKS_PER_SECOND, 
+                            &ticks_per_second);
+          }
+        rtems_task_wake_after((ticks_per_second+24)/25);
       }
         

c/src/lib/libbsp/i386/pc386/startup/exit.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <bsp.h>
+#include <rtems/libio.h>
 #include <pc386uart.h>
 
@@ -71 +72 @@
   else
     {
+      /* Close console */
+      __rtems_close(2);
+      __rtems_close(1);
+      __rtems_close(0);
+
       PC386_uart_intr_ctrl(PC386ConsolePort, PC386_UART_INTR_CTRL_DISABLE);