Changeset eedbfd9 in rtems


Ignore:
Timestamp:
Dec 1, 1995, 7:27:40 PM (24 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
7f6fab6
Parents:
c4808ca
Message:

Corrected use of the state WATCHDOG_REINSERT and renamed it
WATCHDOG_BEING_INSERTED.

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/score/headers/watchdog.h

    rc4808ca reedbfd9  
    6767
    6868typedef enum {
    69   WATCHDOG_INACTIVE,     /* off all chains */
    70   WATCHDOG_ACTIVE,       /* on chain, allowed to fire */
    71   WATCHDOG_REINSERT,     /* on chain, reset without firing if expires */
    72   WATCHDOG_REMOVE_IT     /* on chain, remove without firing if expires */
     69  WATCHDOG_INACTIVE,       /* off all chains */
     70  WATCHDOG_BEING_INSERTED, /* off all chains, searching for insertion point */
     71  WATCHDOG_ACTIVE,         /* on chain, allowed to fire */
     72  WATCHDOG_REMOVE_IT       /* on chain, remove without firing if expires */
    7373} Watchdog_States;
    7474
  • c/src/exec/score/include/rtems/score/watchdog.h

    rc4808ca reedbfd9  
    6767
    6868typedef enum {
    69   WATCHDOG_INACTIVE,     /* off all chains */
    70   WATCHDOG_ACTIVE,       /* on chain, allowed to fire */
    71   WATCHDOG_REINSERT,     /* on chain, reset without firing if expires */
    72   WATCHDOG_REMOVE_IT     /* on chain, remove without firing if expires */
     69  WATCHDOG_INACTIVE,       /* off all chains */
     70  WATCHDOG_BEING_INSERTED, /* off all chains, searching for insertion point */
     71  WATCHDOG_ACTIVE,         /* on chain, allowed to fire */
     72  WATCHDOG_REMOVE_IT       /* on chain, remove without firing if expires */
    7373} Watchdog_States;
    7474
  • c/src/exec/score/src/watchdog.c

    rc4808ca reedbfd9  
    5959      break;
    6060
    61     case WATCHDOG_REINSERT
     61    case WATCHDOG_BEING_INSERTED
    6262   
    6363      /*
     
    152152
    153153  insert_isr_nest_level   = _ISR_Nest_level;
    154   the_watchdog->state = WATCHDOG_REINSERT;
     154  the_watchdog->state = WATCHDOG_BEING_INSERTED;
    155155
    156156  _Watchdog_Sync_count++;
     
    185185     _ISR_Flash( level );
    186186
    187      if ( the_watchdog->state != WATCHDOG_REINSERT ) {
     187     if ( the_watchdog->state != WATCHDOG_BEING_INSERTED ) {
    188188       goto exit_insert;
    189189     }
     
    244244         );
    245245         break;
    246        case WATCHDOG_REINSERT:
    247          _Watchdog_Insert( header, the_watchdog, WATCHDOG_ACTIVATE_NOW );
    248          break;
     246
    249247       case WATCHDOG_INACTIVE:
     248         /*
     249          *  This state indicates that the watchdog is not on any chain.
     250          *  Thus, it is NOT on a chain being tickled.  This case should
     251          *  never occur.
     252          */
     253         break;
     254
     255       case WATCHDOG_BEING_INSERTED:
     256         /*
     257          *  This state indicates that the watchdog is in the process of
     258          *  BEING inserted on the chain.  Thus, it can NOT be on a chain
     259          *  being tickled.  This case should never occur.
     260          */
     261         break;
     262
    250263       case WATCHDOG_REMOVE_IT:
    251264         break;
  • cpukit/score/include/rtems/score/watchdog.h

    rc4808ca reedbfd9  
    6767
    6868typedef enum {
    69   WATCHDOG_INACTIVE,     /* off all chains */
    70   WATCHDOG_ACTIVE,       /* on chain, allowed to fire */
    71   WATCHDOG_REINSERT,     /* on chain, reset without firing if expires */
    72   WATCHDOG_REMOVE_IT     /* on chain, remove without firing if expires */
     69  WATCHDOG_INACTIVE,       /* off all chains */
     70  WATCHDOG_BEING_INSERTED, /* off all chains, searching for insertion point */
     71  WATCHDOG_ACTIVE,         /* on chain, allowed to fire */
     72  WATCHDOG_REMOVE_IT       /* on chain, remove without firing if expires */
    7373} Watchdog_States;
    7474
  • cpukit/score/src/watchdog.c

    rc4808ca reedbfd9  
    5959      break;
    6060
    61     case WATCHDOG_REINSERT
     61    case WATCHDOG_BEING_INSERTED
    6262   
    6363      /*
     
    152152
    153153  insert_isr_nest_level   = _ISR_Nest_level;
    154   the_watchdog->state = WATCHDOG_REINSERT;
     154  the_watchdog->state = WATCHDOG_BEING_INSERTED;
    155155
    156156  _Watchdog_Sync_count++;
     
    185185     _ISR_Flash( level );
    186186
    187      if ( the_watchdog->state != WATCHDOG_REINSERT ) {
     187     if ( the_watchdog->state != WATCHDOG_BEING_INSERTED ) {
    188188       goto exit_insert;
    189189     }
     
    244244         );
    245245         break;
    246        case WATCHDOG_REINSERT:
    247          _Watchdog_Insert( header, the_watchdog, WATCHDOG_ACTIVATE_NOW );
    248          break;
     246
    249247       case WATCHDOG_INACTIVE:
     248         /*
     249          *  This state indicates that the watchdog is not on any chain.
     250          *  Thus, it is NOT on a chain being tickled.  This case should
     251          *  never occur.
     252          */
     253         break;
     254
     255       case WATCHDOG_BEING_INSERTED:
     256         /*
     257          *  This state indicates that the watchdog is in the process of
     258          *  BEING inserted on the chain.  Thus, it can NOT be on a chain
     259          *  being tickled.  This case should never occur.
     260          */
     261         break;
     262
    250263       case WATCHDOG_REMOVE_IT:
    251264         break;
Note: See TracChangeset for help on using the changeset viewer.