Changeset c4e9f68 in rtems


Ignore:
Timestamp:
Dec 19, 2002, 2:49:13 PM (18 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
53872c1
Parents:
28ed8f3
Message:

2002-12-19 Joel Sherrill <joel@…>

  • console/console.c: Removed assert() which conflicts with newlib.
Location:
c/src/lib/libbsp
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/i386/i386ex/ChangeLog

    r28ed8f3 rc4e9f68  
     12002-12-19      Joel Sherrill <joel@OARcorp.com>
     2
     3        * console/console.c: Removed __assert() which conflicts with newlib.
     4
    152002-12-17      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    26
  • c/src/lib/libbsp/i386/i386ex/console/console.c

    r28ed8f3 rc4e9f68  
    3737#include <assert.h>
    3838
    39 /* workaround for gcc development tools */
    40 #undef __assert
    41 void __assert (const char *file, int line, const char *msg);
    42 
    4339#include <bsp.h>
    4440#include <irq.h>
     
    9692  return BSP_irq_enabled_at_i8259s(irq->name);
    9793}
    98 
    99 void __assert (const char *file, int line, const char *msg)
    100 {
    101     static   char exit_msg[] = "EXECUTIVE SHUTDOWN! Any key to reboot...";
    102   unsigned char  ch;
    103    
    104   /*
    105    * Note we cannot call exit or printf from here,
    106    * assert can fail inside ISR too
    107    */
    108 
    109    /*
    110    * Close console
    111    */
    112   close(2);
    113   close(1);
    114   close(0);
    115 
    116   printk("\nassert failed: %s: ", file);
    117   printk("%d: ", line);
    118   printk("%s\n\n", msg);
    119   printk(exit_msg);
    120   ch = BSP_poll_char();
    121   printk("\nShould jump to reset now!\n");
    122 }
    123 
    12494
    12595/*-------------------------------------------------------------------------+
  • c/src/lib/libbsp/i386/ts_386ex/ChangeLog

    r28ed8f3 rc4e9f68  
     12002-12-19      Joel Sherrill <joel@OARcorp.com>
     2
     3        * console/console.c: Removed __assert() which conflicts with newlib.
     4
    152002-12-17      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    26
  • c/src/lib/libbsp/i386/ts_386ex/console/console.c

    r28ed8f3 rc4e9f68  
    3838#include <rtems/error.h>
    3939
    40 /* workaround for gcc development tools */
    41 #undef __assert
    42 void __assert (const char *file, int line, const char *msg);
    43 
    4440#include <bsp.h>
    4541#include <irq.h>
     
    9692  return BSP_irq_enabled_at_i8259s(irq->name);
    9793}
    98 
    99 void __assert (const char *file, int line, const char *msg)
    100 {
    101     static   char exit_msg[] = "EXECUTIVE SHUTDOWN! Any key to reboot...";
    102   unsigned char  ch;
    103    
    104   /*
    105    * Note we cannot call exit or printf from here,
    106    * assert can fail inside ISR too
    107    */
    108 
    109    /*
    110    * Close console
    111    */
    112   close(2);
    113   close(1);
    114   close(0);
    115 
    116   printk("\nassert failed: %s: ", file);
    117   printk("%d: ", line);
    118   printk("%s\n\n", msg);
    119   printk(exit_msg);
    120   ch = BSP_poll_char();
    121   printk("\nShould jump to reset now!\n");
    122 }
    123 
    12494
    12595/*-------------------------------------------------------------------------+
  • c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog

    r28ed8f3 rc4e9f68  
     12002-12-19      Joel Sherrill <joel@OARcorp.com>
     2
     3        * console/console.c: Removed __assert() which conflicts with newlib.
     4
    152002-12-17      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    26
  • c/src/lib/libbsp/powerpc/shared/ChangeLog

    r28ed8f3 rc4e9f68  
     12002-12-19      Joel Sherrill <joel@OARcorp.com>
     2
     3        * console/console.c: Removed __assert() which conflicts with newlib.
     4
    152002-11-17      Greg Menke <gregory.menke@gsfc.nasa.gov>
    26
  • c/src/lib/libbsp/powerpc/shared/console/console.c

    r28ed8f3 rc4e9f68  
    2727#include <stdlib.h>
    2828
    29 #undef __assert
    30 void __assert (const char *file, int line, const char *msg);
    3129extern int close(int fd);
    3230
     
    5654
    5755static int  conSetAttr(int minor, const struct termios *);
    58 
    59 void __assert (const char *file, int line, const char *msg)
    60 {
    61     static   char exit_msg[] = "EXECUTIVE SHUTDOWN! Any key to reboot...";
    62   unsigned char  ch;
    63    
    64   /*
    65    * Note we cannot call exit or printf from here,
    66    * assert can fail inside ISR too
    67    */
    68 
    69    /*
    70     * Close console
    71    */
    72   close(2);
    73   close(1);
    74   close(0);
    75 
    76   printk("\nassert failed: %s: ", file);
    77   printk("%d: ", line);
    78   printk("%s\n\n", msg);
    79   printk(exit_msg);
    80   ch = debug_getc();
    81   printk("\n\n");
    82   rtemsReboot();
    83 
    84 }
    8556
    8657typedef struct TtySTblRec_ {
Note: See TracChangeset for help on using the changeset viewer.